Remove Wikidata autocomplete for tags

Also fix up error in pagination status and add i18n for the form field label. Bug: #169
samwilson · Jan 22, 2023 · 595fb1d · 595fb1d
1 parent 618d335
commit 595fb1d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 17 deletions.
diff --git a/src/Controller/TagController.php b/src/Controller/TagController.php
@@ -70,16 +70,16 @@ public function viewTag(
      */
     public function tagSearchJson(
         Request $request,
-        TagRepository $tagRepository,
-        WikidataRepository $wikidataRepository
+        TagRepository $tagRepository
     ) {
         $q = $request->get('q', '');
         $page = (int)$request->get('page', 1);
-        $tagsResults = $tagRepository->search($q, $page, $this->getUser());
+        $pageSize = 20;
+        $tagsResults = $tagRepository->search($q, $page, $pageSize, $this->getUser());
         $tags = [
             'results' => [],
         ];
-        if ($page === 1) {
+        if ($page === 1 && count($tagsResults) >= $pageSize) {
             $tags['pagination'] = ['more' => true];
         }
         foreach ($tagsResults as $tag) {
@@ -88,16 +88,6 @@ public function tagSearchJson(
                 'text' => $tag->getTitle(),
             ];
         }
-        // If not many local results are found, augment them with Wikidata items.
-        if ($q && $page > 1 && count($tags['results']) < 10) {
-            $wikidata = $wikidataRepository->search($q);
-            foreach ($wikidata['results'] as $result) {
-                $tags['results'][] = [
-                    'id' => $result['text'],
-                    'text' => $result['text'] . ' (' . $result['id'] . ' - ' . $result['description'] . ')',
-                ];
-            }
-        }
         return new JsonResponse($tags);
     }
 

diff --git a/src/Repository/TagRepository.php b/src/Repository/TagRepository.php
@@ -182,12 +182,11 @@ public function findWikidata(): array
      * @param User|null $user
      * @return array
      */
-    public function search(string $term, int $pageNum, ?User $user = null): array
+    public function search(string $term, int $pageNum, int $pageSize, ?User $user = null): array
     {
         if (empty($term)) {
             return [];
         }
-        $pageSize = 20;
         $groupList = $user ? $user->getGroupIdList() : false;
         if (!$groupList) {
             $groupList = UserGroup::PUBLIC;

diff --git a/templates/post/form.html.twig b/templates/post/form.html.twig
@@ -87,7 +87,7 @@
             </span>
         </p>
         <p>
-            <label for="tags">Tags (semicolon-separated):</label>
+            <label for="tags">{{'posts.tags_label'|trans}}</label>
             <select multiple id="tags" name="tags[]" class="app-select2" tabindex="80">
                 {% for tag in post.tags %}
                     <option value="{{ tag.title }}" selected>{{ tag.title }}</option>

diff --git a/translations/messages.en.yaml b/translations/messages.en.yaml
@@ -11,6 +11,7 @@ security:
     log_in: 'Log in'
     remember_me: 'Remember me'
 posts:
+    tags_label: 'Tags:'
     replies: 'Replies'
     download_link: 'Download'
     save_tooltip: 'Save the full version of this file'