Merge pull request #159 from denis1011101/backlog/b-33-search-input

Backlog/b 33 search input

Author: denis1011101

app/controllers/court_suggestions_controller.rb

@@ -26,8 +26,7 @@ def create
     @proposed_court.assign_attributes(editable_params)
     @suggestion = @court.court_suggestions.build(
       user: current_user,
-      payload: changed_payload,
-      comment: params.dig(:court_suggestion, :comment)
+      payload: changed_payload
     )
 
     if @suggestion.save

app/javascript/controllers/geolocation_controller.js

@@ -21,7 +21,7 @@ export default class extends Controller {
     this.isSearching = false
     this.searchTimeout = null
     this.clearResultsTimeout = null
-    this.lastSearchResults = []
+    this.selectableResults = []
 
     // Добавляем слушатели один раз
     if (this.hasInputTarget) {
@@ -164,27 +164,35 @@ export default class extends Controller {
     if (!items?.length) {
       this.resultsTarget.innerHTML = ""
       this.resultsTarget.classList.add("hidden")
+      this.selectableResults = []
       return
     }
 
+    // Служебные строки («Ищу…», «Ничего не найдено») рисуем, но выбирать их нельзя:
+    // data-idx считаем по выбираемым элементам, их же и запоминаем.
+    const selectable = []
+
     this.resultsTarget.innerHTML = items
-      .map((item, idx) =>
-        item.class === "muted"
-          ? `<div class="p-3 text-sm text-gray-500 text-center">${escapeHtml(item.label)}</div>`
-          : `<button type="button" data-action="click->geolocation#selectResult" data-idx="${idx}" class="w-full text-left p-3 hover:bg-gray-100 text-sm border-b last:border-b-0 transition">
+      .map((item) => {
+        if (!isSelectableResult(item)) {
+          return `<div class="p-3 text-sm text-gray-500 text-center">${escapeHtml(item.label)}</div>`
+        }
+
+        const idx = selectable.push(item) - 1
+        return `<button type="button" data-action="click->geolocation#selectResult" data-idx="${idx}" class="w-full text-left p-3 hover:bg-gray-100 text-sm border-b last:border-b-0 transition">
               <div class="font-medium text-gray-800">${escapeHtml(item.label)}</div>
             </button>`
-      )
+      })
       .join("")
 
     this.resultsTarget.classList.remove("hidden")
-    this.lastSearchResults = items
+    this.selectableResults = selectable
   }
 
   selectResult(e) {
     e.preventDefault()
     const idx = parseInt(e.currentTarget.dataset.idx, 10)
-    const item = this.lastSearchResults?.[idx]
+    const item = this.selectableResults?.[idx]
 
     if (!item || !this.hasInputTarget) return
 
@@ -194,7 +202,7 @@ export default class extends Controller {
   }
 
   selectResultByIndex(idx) {
-    const item = this.lastSearchResults[idx]
+    const item = this.selectableResults[idx]
     if (item) {
       this.setCoordinates(item.lat, item.lon)
       this.clearResults()
@@ -207,33 +215,27 @@ export default class extends Controller {
     if (!val || this.isCoordinates(val)) return
 
     e.preventDefault()
-    if (this.lastSearchResults.length > 0) {
+    if (this.selectableResults.length > 0) {
       this.selectResultByIndex(0)
     } else {
       this.searchCity(val)
     }
   }
 
-  onFormSubmit(e) {
-    if (!this.hasInputTarget) return
-    const input = this.inputTarget.value.trim()
-
-    if (!input || this.isCoordinates(input)) return
-
-    e.preventDefault()
-    this.lastSearchResults.length > 0 ? null : this.searchCity(input)
-  }
-
   clearResults() {
     this.cancelResultsClear()
     if (this.hasResultsTarget) {
       this.resultsTarget.innerHTML = ""
       this.resultsTarget.classList.add("hidden")
     }
-    this.lastSearchResults = []
+    this.selectableResults = []
   }
 }
 
+function isSelectableResult(item) {
+  return item?.class !== "muted" && Number.isFinite(item?.lat) && Number.isFinite(item?.lon)
+}
+
 function escapeHtml(unsafe) {
   return String(unsafe)
     .replace(/&/g, "&amp;")

app/models/court_suggestion.rb

@@ -12,7 +12,7 @@ class CourtSuggestion < ApplicationRecord
     conditions: -> { where(status: "pending") },
     message: :pending_exists
   }
-  validate :payload_or_comment_present
+  validate :payload_present, on: :create
   validate :payload_fields_are_editable
 
   scope :pending, -> { where(status: "pending") }
@@ -52,8 +52,11 @@ def reject_by!(admin)
 
   private
 
-  def payload_or_comment_present
-    errors.add(:base, :blank_suggestion) if payload.blank? && comment.blank?
+  # Комментарий остался только у записей, созданных до того, как поле убрали из формы,
+  # поэтому новое предложение обязано менять хотя бы одно поле. Проверяем на создании:
+  # иначе модератор не смог бы одобрить или отклонить давнее предложение без правок.
+  def payload_present
+    errors.add(:base, :blank_suggestion) if payload.blank?
   end
 
   def payload_fields_are_editable

app/views/court_suggestions/new.html.erb

@@ -17,13 +17,6 @@
         local: true do |form| %>
     <%= render "courts/fields", form: form, court: @proposed_court %>
 
-    <div class="mt-4">
-      <%= label_tag "court_suggestion_comment", t("courts.suggestions.comment"), class: "block text-sm font-semibold text-gray-800 dark:text-slate-200" %>
-      <%= text_area_tag "court_suggestion[comment]", @suggestion.comment, rows: 4,
-            placeholder: t("courts.suggestions.comment_placeholder"),
-            class: "mt-1 block w-full rounded-md border border-gray-300 bg-white px-3 py-2 dark:border-white/15 dark:bg-slate-700 dark:text-slate-100" %>
-    </div>
-
     <div class="mt-4 flex items-center gap-2">
       <%= form.submit t("courts.suggestions.submit"), class: "rounded-md bg-indigo-600 px-4 py-2 text-white hover:bg-indigo-700" %>
       <%= link_to t("courts.suggestions.cancel"), @court, class: "rounded-md border border-gray-300 px-3 py-2 text-sm text-gray-700 dark:border-white/10 dark:text-slate-300" %>

app/views/searches/index.html.erb

@@ -9,7 +9,6 @@
   <%= form_with url: searches_path, method: :get, local: true,
       data: {
         controller: "geolocation",
-        action: "submit->geolocation#onFormSubmit",
         geolocation_unsupported_value: t("searches.index.geolocation.unsupported"),
         geolocation_permission_denied_value: t("searches.index.geolocation.permission_denied"),
         geolocation_unavailable_value: t("searches.index.geolocation.unavailable"),

config/locales/en.yml

@@ -31,7 +31,7 @@ en:
   errors:
     messages:
       pending_exists: "already has a pending suggestion for this court"
-      blank_suggestion: "Change at least one field or add a comment"
+      blank_suggestion: "Change at least one field"
       invalid_fields: "contains fields that cannot be changed"
   score_recognitions:
     errors:
@@ -498,7 +498,6 @@ en:
       new_title: "Suggest a correction for %{court}"
       new_help: "Change only the details that are inaccurate. The current court stays published until a moderator reviews your suggestion."
       comment: "Comment"
-      comment_placeholder: "Looking for one more player, any level. Balls are on me, we play 1.5 hours"
       submit: "Send suggestion"
       cancel: "Cancel"
       created: "Thank you. Your suggestion was sent for moderator review."

config/locales/es.yml

@@ -2,7 +2,7 @@ es:
   errors:
     messages:
       pending_exists: "ya tiene una propuesta pendiente para esta pista"
-      blank_suggestion: "Cambia al menos un campo o añade un comentario"
+      blank_suggestion: "Cambia al menos un campo"
       invalid_fields: "contiene campos que no se pueden cambiar"
   score_recognitions:
     errors:
@@ -473,7 +473,6 @@ es:
       new_title: "Proponer una corrección para %{court}"
       new_help: "Cambia solo los datos incorrectos. La pista actual seguirá publicada hasta que un moderador revise la propuesta."
       comment: "Comentario"
-      comment_placeholder: "Buscamos a un jugador más, cualquier nivel. Llevo las pelotas, jugamos 1,5 horas"
       submit: "Enviar propuesta"
       cancel: "Cancelar"
       created: "Gracias. Tu propuesta se ha enviado para revisión."

config/locales/ru.yml

@@ -2,7 +2,7 @@ ru:
   errors:
     messages:
       pending_exists: "уже имеет предложение для этого корта на проверке"
-      blank_suggestion: "Измените хотя бы одно поле или добавьте комментарий"
+      blank_suggestion: "Измените хотя бы одно поле"
       invalid_fields: "содержит поля, которые нельзя изменять"
   score_recognitions:
     errors:
@@ -482,7 +482,6 @@ ru:
       new_title: "Предложить правку для корта «%{court}»"
       new_help: "Измените только неточные данные. Текущий корт останется опубликованным до проверки предложения модератором."
       comment: "Комментарий"
-      comment_placeholder: "Ищем ещё одного игрока, уровень любой. Мяч свой, играем 1,5 часа"
       submit: "Отправить предложение"
       cancel: "Отмена"
       created: "Спасибо. Предложение отправлено на проверку модератору."

test/controllers/court_suggestions_controller_test.rb

@@ -26,7 +26,7 @@ class CourtSuggestionsControllerTest < ActionDispatch::IntegrationTest
 
     assert_response :success
     assert_select "input[name='court_suggestion[name]'][value='Published Court']"
-    assert_select "textarea[name='court_suggestion[comment]']"
+    assert_select "textarea[name='court_suggestion[comment]']", count: 0
   end
 
   test "owner is sent to the normal edit form" do
@@ -49,22 +49,21 @@ class CourtSuggestionsControllerTest < ActionDispatch::IntegrationTest
 
     suggestion = @court.court_suggestions.find_by!(user: @author)
     assert_equal({ "sport" => "Padel" }, suggestion.payload)
-    assert_equal "The lines were changed.", suggestion.comment
+    assert_nil suggestion.comment
     assert_equal @court.name, @court.reload.name
     assert_redirected_to @court
     assert_equal suggestion, notified.first.first
   end
 
-  test "comment-only suggestion is accepted" do
+  test "suggestion without a single changed field is rejected" do
     sign_in_as(@author)
 
     post court_corrections_url(@court), params: {
       court_suggestion: { name: @court.name, sport: @court.sport, comment: "Opening hours are wrong." }
     }
 
-    suggestion = @court.court_suggestions.find_by!(user: @author)
-    assert_empty suggestion.payload
-    assert_redirected_to @court
+    assert_response :unprocessable_entity
+    assert_nil @court.court_suggestions.find_by(user: @author)
   end
 
   test "second pending suggestion is rejected" do

test/models/court_suggestion_test.rb

@@ -1,16 +1,27 @@
 require "test_helper"
 
 class CourtSuggestionTest < ActiveSupport::TestCase
-  test "requires a changed field or comment" do
+  test "requires a changed field" do
     suggestion = CourtSuggestion.new(court: courts(:one), user: users(:one), payload: {})
 
     assert_not suggestion.valid?
+    assert_includes suggestion.errors[:base], I18n.t("errors.messages.blank_suggestion")
   end
 
-  test "allows comment-only suggestion" do
+  test "a comment alone no longer makes a suggestion" do
     suggestion = CourtSuggestion.new(court: courts(:one), user: users(:one), payload: {}, comment: "The opening hours are outdated")
 
-    assert suggestion.valid?
+    assert_not suggestion.valid?
+  end
+
+  test "a comment-only suggestion saved before the field went away can still be reviewed" do
+    admin = users(:one)
+    admin.update_column(:admin, true)
+    suggestion = CourtSuggestion.new(court: courts(:two), user: users(:two), payload: {}, comment: "The opening hours are outdated")
+    suggestion.save!(validate: false)
+
+    assert suggestion.reject_by!(admin)
+    assert_equal "rejected", suggestion.reload.status
   end
 
   test "allows only one pending suggestion per user and court" do