Collections: Choose first if applicable

Author: JanMikes

assets/controllers/puzzle_add_form_controller.js

@@ -15,6 +15,7 @@ export default class extends Controller {
         'commonSection',       // Comment, photo (Speed + Relax)
         'collectionSection',   // Collection fields (Collection only)
         'newCollectionFields', // New collection name/visibility (Collection, when creating new)
+        'collectionInput',     // The collection tom-select input
     ];
 
     static values = {
@@ -30,6 +31,8 @@ export default class extends Controller {
             const collectionInput = this.collectionSectionTarget.querySelector('input[type="text"], select');
             if (collectionInput) {
                 collectionInput.addEventListener('change', this.handleCollectionChange.bind(this));
+                // Listen for tom-select initialization to auto-select single option
+                collectionInput.addEventListener('autocomplete:connect', this._autoSelectSingleOption.bind(this));
             }
         }
     }
@@ -101,4 +104,16 @@ export default class extends Controller {
         const uuidRegex = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-7][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
         return uuidRegex.test(value);
     }
+
+    _autoSelectSingleOption(event) {
+        const tomselect = event.target.tomselect;
+        if (!tomselect || event.target.value) {
+            return; // Already has value or no tomselect
+        }
+
+        const optionKeys = Object.keys(tomselect.options);
+        if (optionKeys.length === 1) {
+            tomselect.setValue(optionKeys[0]);
+        }
+    }
 }

assets/controllers/puzzle_collection_form_controller.js

@@ -88,6 +88,17 @@ export default class extends Controller {
             return;
         }
 
+        const tomselect = this.collectionTarget.tomselect;
+
+        // Auto-select if only one option is available and nothing is selected
+        if (tomselect && !this.collectionTarget.value) {
+            const optionKeys = Object.keys(tomselect.options);
+            if (optionKeys.length === 1) {
+                tomselect.setValue(optionKeys[0]);
+                return; // Value is now set, no need for further checks
+            }
+        }
+
         const currentValue = this.collectionTarget.value;
         if (currentValue && !this.uuidRegex.test(currentValue) && currentValue !== this.systemIdValue) {
             // If there's an initial value that's not a UUID or system collection, show new collection fields

src/Controller/Collections/AddPuzzleToCollectionController.php

@@ -87,6 +87,9 @@ public function __invoke(
         // Set default collection to system collection for users without membership
         if ($hasActiveMembership === false) {
             $formData->collection = Collection::SYSTEM_ID;
+        } elseif (count($collectionChoices) === 1) {
+            // Pre-fill if only one collection is available (saves a click)
+            $formData->collection = array_first($collectionChoices);
         }
 
         $form = $this->createForm(CollectionPuzzleActionFormType::class, $formData, [

src/Controller/PuzzleAddController.php

@@ -134,10 +134,24 @@ public function __invoke(
             $initialMode = 'relax';
         }
 
-        // For non-members in collection mode, force system collection
+        // Get player collections for form options (include system collection)
         $hasActiveMembership = $userProfile->activeMembership;
-        if ($data->mode === PuzzleAddMode::Collection && $hasActiveMembership === false) {
+        $collections = [];
+        $systemCollectionName = $this->translator->trans('collections.system_name');
+        $collections[$systemCollectionName] = Collection::SYSTEM_ID;
+
+        foreach ($this->getPlayerCollections->byPlayerId($userProfile->playerId) as $collection) {
+            if ($collection->collectionId !== null) {
+                $collections[$collection->name] = $collection->collectionId;
+            }
+        }
+
+        // For non-members, force system collection
+        if ($hasActiveMembership === false) {
             $data->collection = Collection::SYSTEM_ID;
+        } elseif (count($collections) === 1 && $data->collection === null) {
+            // Pre-fill if only one collection is available (saves a click)
+            $data->collection = array_first($collections);
         }
 
         /** @var array<string> $groupPlayers */
@@ -151,17 +165,6 @@ public function __invoke(
             }
         }
 
-        // Get player collections for form options (include system collection)
-        $collections = [];
-        $systemCollectionName = $this->translator->trans('collections.system_name');
-        $collections[$systemCollectionName] = Collection::SYSTEM_ID;
-
-        foreach ($this->getPlayerCollections->byPlayerId($userProfile->playerId) as $collection) {
-            if ($collection->collectionId !== null) {
-                $collections[$collection->name] = $collection->collectionId;
-            }
-        }
-
         $addTimeForm = $this->createForm(PuzzleAddFormType::class, $data, [
             'active_puzzle' => $activePuzzle,
             'collections' => $collections,

src/Controller/PuzzleReport/PendingProposalsModalController.php

@@ -23,6 +23,10 @@ public function __construct(
         path: [
             'cs' => '/puzzle/{puzzleId}/cekajici-navrhy',
             'en' => '/en/puzzle/{puzzleId}/pending-proposals',
+            'es' => '/es/puzzle/{puzzleId}/propuestas-pendientes',
+            'ja' => '/ja/puzzle/{puzzleId}/pending-proposals',
+            'fr' => '/fr/puzzle/{puzzleId}/propositions-en-attente',
+            'de' => '/de/puzzle/{puzzleId}/ausstehende-vorschlaege',
         ],
         name: 'puzzle_pending_proposals',
         methods: ['GET'],