fix: Title & Artist mode hydration + equal reveal footer buttons (v4.1.0-rc7) (#1469)

- Fix "Name the Song" starting as a year-guess game. admin.js hydrateFromStorage
  copied every saved game-mode flag into adminState EXCEPT titleArtistMode, so
  the start payload sent title_artist_mode:false and players got the year input.
  Extracted the settings->adminState mapping into a single shared helper
  applyStoredGameSettings() (admin/util.js) covering all 5 flags, + unit tests,
  so the gap can't recur.
- Equalise the reveal host buttons: "Invite Players" and "Next Round" now share
  the same box metrics (260x56); only colour differs.

325 frontend tests pass (5 new). Regenerated admin.min.js (npm run build) +
styles.min.css.

Co-authored-by: Claude Code <coba@aupairsync.com>
Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>

Author: 3 people

CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to Beatify are documented here. For detailed release notes,
 
 ## [Unreleased]
 
+## [4.1.0-rc7] - 2026-06-13
+
+### Fixed
+- **"Name the Song" (Title & Artist) mode no longer starts as a year-guess game.** The wizard saved the chosen mode, but the admin home→start hydration path (`admin.js` `hydrateFromStorage`) copied every game-mode flag from saved settings into `adminState` *except* `titleArtistMode`, so the start payload sent `title_artist_mode: false` and players got the year input instead of the title/artist text fields. The settings→`adminState` mapping is now a single shared helper (`applyStoredGameSettings` in `admin/util.js`) covering all five mode flags, with unit tests — so a new mode flag can't be dropped on this path again.
+
+### Changed
+- **Reveal host buttons are now equal-sized.** "Invite Players" and "Next Round" share the same box metrics (width + height); only their colour differs (pink primary vs ghost).
+
 ## [4.1.0-rc6] - 2026-06-13
 
 ### Changed

custom_components/beatify/manifest.json

@@ -19,5 +19,5 @@
     "num2words==0.5.14"
   ],
   "single_config_entry": true,
-  "version": "4.1.0-rc6"
+  "version": "4.1.0-rc7"
 }

custom_components/beatify/www/css/styles.css

@@ -15632,6 +15632,23 @@ body.theme-dark .your-result-stats .stat-value {
     backdrop-filter: blur(20px);
     border-radius: var(--radius-full);
 }
+/* Equalise the two footer buttons — same box metrics + equal width, so
+   "Spieler einladen" and "Nächste Runde" match (only their colour differs). */
+#reveal-view .reveal-admin-buttons { align-items: stretch; }
+#reveal-view .reveal-admin-buttons .invite-btn,
+#reveal-view .reveal-admin-buttons .next-round-btn {
+    flex: 1 1 0;
+    min-width: 0;
+    max-width: 260px;
+    min-height: 56px;
+    padding: 12px 20px;
+    font-size: var(--font-size-md);
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    gap: var(--space-sm);
+    text-align: center;
+}
 
 /* ==========================================================================
    Reveal standings — "Round-Delta Ledger" (design-shotgun A)

custom_components/beatify/www/css/styles.min.css

@@ -24,6 +24,7 @@ import {
     groupPlayersByPlatform,
     escapeHtml,
     buildRequestRowHtml,
+    applyStoredGameSettings,
 } from '../admin/util.js';
 
 // --- minimal localStorage / sessionStorage stub ----------------------------
@@ -243,3 +244,57 @@ describe('admin/util.js pure helpers — buildRequestRowHtml (#1279 step 2)', ()
         expect(html).toContain('request-item-thumbnail-placeholder');
     });
 });
+
+describe('applyStoredGameSettings — settings → adminState hydration', () => {
+    // Regression for #1180: the wizard saved titleArtistMode:true but the
+    // home→start hydration path dropped it, so "name the song" started as a
+    // year game (players got the year input instead of title/artist fields).
+    it('hydrates title_artist_mode (the missed flag) from saved settings', () => {
+        const adminState = { titleArtistModeEnabled: false };
+        applyStoredGameSettings(adminState, { titleArtistMode: true });
+        expect(adminState.titleArtistModeEnabled).toBe(true);
+    });
+
+    it('hydrates every game-mode flag from saved settings', () => {
+        const adminState = {
+            artistChallengeEnabled: false, movieQuizEnabled: false,
+            introModeEnabled: false, closestWinsModeEnabled: false,
+            titleArtistModeEnabled: false,
+        };
+        applyStoredGameSettings(adminState, {
+            artistChallenge: true, movieQuiz: true, introMode: true,
+            closestWinsMode: true, titleArtistMode: true,
+        });
+        expect(adminState).toMatchObject({
+            artistChallengeEnabled: true, movieQuizEnabled: true,
+            introModeEnabled: true, closestWinsModeEnabled: true,
+            titleArtistModeEnabled: true,
+        });
+    });
+
+    it('hydrates scalar settings (language, duration, difficulty, provider, autoadvance)', () => {
+        const adminState = {};
+        applyStoredGameSettings(adminState, {
+            language: 'de', duration: 45, revealAutoAdvance: 30,
+            difficulty: 'hard', provider: 'spotify',
+        });
+        expect(adminState).toMatchObject({
+            selectedLanguage: 'de', selectedDuration: 45, revealAutoAdvance: 30,
+            selectedDifficulty: 'hard', selectedProvider: 'spotify',
+        });
+    });
+
+    it('leaves flags untouched for absent / wrong-typed keys (partial / legacy payloads)', () => {
+        const adminState = { titleArtistModeEnabled: true, artistChallengeEnabled: true };
+        applyStoredGameSettings(adminState, { titleArtistMode: 'yes' /* not boolean */ });
+        expect(adminState.titleArtistModeEnabled).toBe(true);   // unchanged
+        expect(adminState.artistChallengeEnabled).toBe(true);   // absent key, unchanged
+    });
+
+    it('is a no-op for null / non-object input', () => {
+        const adminState = { titleArtistModeEnabled: false };
+        applyStoredGameSettings(adminState, null);
+        applyStoredGameSettings(null, { titleArtistMode: true });
+        expect(adminState.titleArtistModeEnabled).toBe(false);
+    });
+});

custom_components/beatify/www/js/__tests__/admin-helpers.test.js

@@ -35,6 +35,7 @@ import {
     buildRequestRowHtml,
     escapeHtml,
     acquireWakeLockFirst,
+    applyStoredGameSettings,
 } from './admin/util.js';
 
 // #1279 Schritt 3/6: REST/WS hub layer. The admin WS connection lifecycle +
@@ -340,15 +341,11 @@ document.addEventListener('DOMContentLoaded', async () => {
                 const raw = localStorage.getItem(STORAGE_GAME_SETTINGS);
                 if (raw) {
                     const s = JSON.parse(raw);
-                    if (s.language) adminState.selectedLanguage = s.language;
-                    if (s.duration) adminState.selectedDuration = s.duration;
-                    if (typeof s.revealAutoAdvance === 'number') adminState.revealAutoAdvance = s.revealAutoAdvance;
-                    if (s.difficulty) adminState.selectedDifficulty = s.difficulty;
-                    if (s.provider) adminState.selectedProvider = s.provider;
-                    if (typeof s.artistChallenge === 'boolean') adminState.artistChallengeEnabled = s.artistChallenge;
-                    if (typeof s.movieQuiz === 'boolean') adminState.movieQuizEnabled = s.movieQuiz;
-                    if (typeof s.introMode === 'boolean') adminState.introModeEnabled = s.introMode;
-                    if (typeof s.closestWinsMode === 'boolean') adminState.closestWinsModeEnabled = s.closestWinsMode;
+                    // Single source of truth for the settings→adminState mapping
+                    // (incl. title_artist_mode — its omission here shipped "name
+                    // the song" as a year game, #1180). Playlists stay inline
+                    // below since they need adminState.playlistData.
+                    applyStoredGameSettings(adminState, s);
                     const wizPaths = Array.isArray(s.selectedPlaylists)
                         ? s.selectedPlaylists.map((p) => (typeof p === 'string' ? p : p.path)).filter(Boolean)
                         : [];