Merge remote-tracking branch 'origin/main' into fix/map-hover-title-parity-20260812

# Conflicts:
#	app/game-frontend/e2e/inGameInfo.spec.ts

app/game-frontend/src/components/main/NationBasicCard.vue

@@ -31,15 +31,19 @@ const props = defineProps<{
                 class="title"
                 :style="{ backgroundColor: props.nation.color, color: legacyNationTextColor(props.nation.color) }"
             >
-                {{ props.nation.name }} (Lv {{ props.nation.level }})
+                {{ props.nation.name }}<template v-if="props.nation.id > 0"> (Lv {{ props.nation.level }})</template>
             </div>
             <div class="grid">
-                <span>국고</span><strong>{{ props.nation.gold.toLocaleString() }}</strong> <span>국량</span
-                ><strong>{{ props.nation.rice.toLocaleString() }}</strong> <span>기술</span
-                ><strong>{{ props.nation.tech.toLocaleString() }}</strong> <span>체제</span
-                ><strong>{{ props.nation.typeCode }}</strong> <span>수도</span
-                ><strong>{{ props.nation.capitalCityId ?? '-' }}</strong> <span>국가 등급</span
-                ><strong>{{ props.nation.level }}</strong>
+                <span>국고</span
+                ><strong>{{ props.nation.id === 0 ? '해당 없음' : props.nation.gold.toLocaleString() }}</strong>
+                <span>국량</span
+                ><strong>{{ props.nation.id === 0 ? '해당 없음' : props.nation.rice.toLocaleString() }}</strong>
+                <span>기술</span
+                ><strong>{{ props.nation.id === 0 ? '해당 없음' : props.nation.tech.toLocaleString() }}</strong>
+                <span>체제</span><strong>{{ props.nation.id === 0 ? '해당 없음' : props.nation.typeCode }}</strong>
+                <span>수도</span
+                ><strong>{{ props.nation.id === 0 ? '해당 없음' : (props.nation.capitalCityId ?? '-') }}</strong>
+                <span>국가 등급</span><strong>{{ props.nation.id === 0 ? '해당 없음' : props.nation.level }}</strong>
             </div>
         </div>
     </div>

app/game-frontend/src/views/GlobalInfoView.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { computed, onMounted, ref } from 'vue';
+import { computed, onMounted, ref, watch } from 'vue';
 import { useRouter } from 'vue-router';
 import MapViewer from '../components/main/MapViewer.vue';
 import { trpc } from '../utils/trpc';
@@ -10,6 +10,8 @@ type Layout = Awaited<ReturnType<typeof trpc.world.getMapLayout.query>>;
 const data = ref<Result | null>(null);
 const layout = ref<Layout | null>(null);
 const error = ref('');
+const matrixElement = ref<HTMLTableElement | null>(null);
+const matrixHeight = ref<number | null>(null);
 const router = useRouter();
 const goBack = () => router.push('/');
 const state = (value: number) => ({ 0: '★', 1: '▲', 2: '', 7: '@' })[value] ?? 'ㆍ';
@@ -19,6 +21,23 @@ const nationNameStyle = (color: string) => ({
     backgroundColor: color,
     color: legacyNationTextColor(color),
 });
+watch(
+    matrixElement,
+    (element, _previousElement, onCleanup) => {
+        if (!element) {
+            matrixHeight.value = null;
+            return;
+        }
+        const updateHeight = () => {
+            matrixHeight.value = element.getBoundingClientRect().height;
+        };
+        const observer = new ResizeObserver(updateHeight);
+        observer.observe(element);
+        updateHeight();
+        onCleanup(() => observer.disconnect());
+    },
+    { flush: 'post' }
+);
 onMounted(async () => {
     try {
         [data.value, layout.value] = await Promise.all([
@@ -39,8 +58,8 @@ onMounted(async () => {
         <p v-if="error" class="error">{{ error }}</p>
         <section v-if="data" class="section">
             <h2 class="blue">외교 현황</h2>
-            <div class="matrix-wrap">
-                <table class="matrix">
+            <div class="matrix-wrap" :style="{ height: matrixHeight === null ? undefined : `${matrixHeight}px` }">
+                <table ref="matrixElement" class="matrix">
                     <thead>
                         <tr>
                             <th></th>
@@ -194,7 +213,6 @@ onMounted(async () => {
     background: green;
 }
 .matrix-wrap {
-    height: 1212.5px;
     overflow-x: auto;
     overflow-y: hidden;
 }

app/game-frontend/src/views/YearbookView.vue

@@ -35,6 +35,7 @@ const history = ref<HistoryData | null>(null);
 const selectedYearMonth = ref<number | null>(null);
 const settingsOpen = ref(false);
 const rankingBottom = ref(localStorage.getItem('yearbook-ranking-bottom') === 'true');
+let historyRequestId = 0;
 const serverID = computed(() => {
     const value = route.query.serverID;
     const raw = Array.isArray(value) ? value[0] : value;
@@ -71,19 +72,27 @@ const loadHistory = async (): Promise<void> => {
     if (selectedYearMonth.value === null) {
         return;
     }
+    const requestId = ++historyRequestId;
     loading.value = true;
     errorMessage.value = '';
     try {
         const { year, month } = parseYearMonth(selectedYearMonth.value);
         const result = await trpc.yearbook.getHistory.query({ year, month, serverID: serverID.value });
+        if (requestId !== historyRequestId) {
+            return;
+        }
         if ('data' in result) {
             history.value = result.data;
         }
     } catch (error) {
-        history.value = null;
+        if (requestId !== historyRequestId) {
+            return;
+        }
         errorMessage.value = error instanceof Error ? error.message : '연감 데이터를 불러오지 못했습니다.';
     } finally {
-        loading.value = false;
+        if (requestId === historyRequestId) {
+            loading.value = false;
+        }
     }
 };
 
@@ -129,7 +138,13 @@ onMounted(async () => {
             <strong>연 감</strong>
             <button class="legacy-button close-button" type="button" @click="closePage">창 닫기</button>
             <span class="settings-menu">
-                <button class="legacy-button legacy-button--navigation" type="button" @click="settingsOpen = !settingsOpen">⚙ 설정⌄</button>
+                <button
+                    class="legacy-button legacy-button--navigation"
+                    type="button"
+                    @click="settingsOpen = !settingsOpen"
+                >
+                    ⚙ 설정⌄
+                </button>
                 <button v-if="settingsOpen" class="settings-item" type="button" @click="toggleRankingPosition">
                     국가 순서 위치 변경(모바일 전용)
                 </button>
@@ -164,9 +179,9 @@ onMounted(async () => {
         <div v-if="errorMessage" class="yearbook-message error" role="alert">{{ errorMessage }}</div>
         <div v-else-if="loading && !history" class="yearbook-message">불러오는 중...</div>
 
-        <section v-if="history" :class="['history-grid', { 'ranking-bottom': rankingBottom }]">
+        <section v-if="history" :class="['history-grid', { 'ranking-bottom': rankingBottom }]" :aria-busy="loading">
             <div class="map-position">
-                <MapViewer :map-data="history.map" :map-layout="mapLayout" :loading="loading" />
+                <MapViewer :map-data="history.map" :map-layout="mapLayout" :loading="loading && !history" />
             </div>
             <aside class="nation-position">
                 <table>