blacklight 9.0.0.beta1 → 9.0.0.beta2

data/app/controllers/concerns/blacklight/catalog.rb

@@ -9,13 +9,13 @@ module Blacklight::Catalog
   include Blacklight::Configurable
   include Blacklight::SearchContext
   include Blacklight::Searchable
+  include Blacklight::Facetable
 
   # The following code is executed when someone includes blacklight::catalog in their
   # own controller.
   included do
     if respond_to? :helper_method
       helper_method :sms_mappings, :has_search_parameters?
-      helper_method :search_facet_path
     end
 
     record_search_parameters
@@ -80,17 +80,19 @@ module Blacklight::Catalog
 
   # displays values and pagination links for a single facet field
   def facet
+    # @facet is a Blacklight::Configuration::FacetField
     @facet = blacklight_config.facet_fields[params[:id]]
     raise ActionController::RoutingError, 'Not Found' unless @facet
 
-    query_fragment = params[:query_fragment] || ''
-    @response = if query_fragment.present?
-                  search_service.facet_suggest_response(@facet.key, params[:query_fragment])
+    @response = if params[:query_fragment].present?
+                  facet_search_service.facet_suggest_response(@facet.key, params[:query_fragment])
                 else
-                  @response = search_service.facet_field_response(@facet.key)
+                  facet_search_service.facet_field_response(@facet.key)
                 end
+
     @display_facet = @response.aggregations[@facet.field]
 
+    # @presenter is a Blacklight::FacetFieldPresenter
     @presenter = @facet.presenter.new(@facet, @display_facet, view_context)
     @pagination = @presenter.paginator
     respond_to do |format|
@@ -139,15 +141,6 @@ module Blacklight::Catalog
     params[:search_field].present? || search_state.has_constraints?
   end
 
-  def search_facet_path(options = {})
-    opts = search_state
-           .to_h
-           .merge(action: "facet", only_path: true)
-           .merge(options)
-           .except(:page)
-    url_for opts
-  end
-
   private
 
   #
@@ -236,22 +229,14 @@ module Blacklight::Catalog
   # Email Action (this will render the appropriate view on GET requests and process the form and send the email on POST requests)
   def email_action documents
     mail = RecordMailer.email_record(documents, { to: params[:to], message: params[:message], config: blacklight_config }, url_options)
-    if mail.respond_to? :deliver_now
-      mail.deliver_now
-    else
-      mail.deliver
-    end
+    mail.deliver_now
   end
 
   # SMS action (this will render the appropriate view on GET requests and process the form and send the email on POST requests)
   def sms_action documents
     to = "#{params[:to].gsub(/[^\d]/, '')}@#{params[:carrier]}"
     mail = RecordMailer.sms_record(documents, { to: to, config: blacklight_config }, url_options)
-    if mail.respond_to? :deliver_now
-      mail.deliver_now
-    else
-      mail.deliver
-    end
+    mail.deliver_now
   end
 
   def validate_sms_params
@@ -293,7 +278,7 @@ module Blacklight::Catalog
   def blacklight_advanced_search_form_search_service
     form_search_state = search_state_class.new(blacklight_advanced_search_form_params, blacklight_config, self)
 
-    search_service_class.new(config: blacklight_config, search_state: form_search_state, user_params: form_search_state.to_h, **search_service_context)
+    search_service_class.new(config: blacklight_config, search_state: form_search_state, **search_service_context)
   end
 
   def blacklight_advanced_search_form_params

data/app/controllers/concerns/blacklight/controller.rb

@@ -130,7 +130,7 @@ module Blacklight::Controller
     # send the user home if the access was previously denied by the same
     # request to avoid sending the user back to the login page
     #   (e.g. protected page -> logout -> returned to protected page -> home)
-    redirect_to(root_url) && flash.discard && return if request.referer && request.referer.ends_with?(request.fullpath)
+    redirect_to(root_url) && flash.discard && return if request.referer&.ends_with?(request.fullpath)
 
     redirect_to(root_url) && return unless has_user_authentication_provider?
 

data/app/controllers/concerns/blacklight/facetable.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+# The Facetable module can be included onto classes that need to initialize a FacetSearchService.
+# There are two dependencies you must provide on the including class. Typically these
+# would be provided by Blacklight::Controller
+#  1. search_state
+#  2. blacklight_config
+#
+# Additionally, the including class may override the facet_search_service_context method to provide
+# further context to the SearchService. For example you could override this to provide the
+# currently signed in user.
+module Blacklight::Facetable
+  extend ActiveSupport::Concern
+
+  included do
+    # Which class to use for the search service. You can subclass SearchService if you
+    # want to override any of the methods (e.g. SearchService#fetch)
+    class_attribute :facet_search_service_class
+    self.facet_search_service_class = Blacklight::FacetSearchService
+  end
+
+  # @return [Blacklight::FacetSearchService]
+  def facet_search_service
+    facet_search_service_class.new(config: blacklight_config, search_state: search_state, user_params: search_state.to_h, **facet_search_service_context)
+  end
+
+  # Override this method on the class that includes Blacklight::Facetable to provide more context to the search service if necessary.
+  # For example, if your search builder needs to be aware of the current user, override this method to return a hash including the current user.
+  # Then the search builder could use some property about the current user to construct a constraint on the search.
+  # @return [Hash] a hash of context information to pass through to the search service
+  def facet_search_service_context
+    search_service_context
+  end
+end

data/app/controllers/concerns/blacklight/search_context.rb

@@ -40,7 +40,7 @@ module Blacklight::SearchContext
         @page_link_data[:prev] = page_links_document_path(documents.first, index)
         @page_link_data[:next] = page_links_document_path(documents.last, index + 2)
       end
-      if response&.total && response.total.positive?
+      if response&.total&.positive?
         @page_link_data[:counterRaw] = counter_param
         @page_link_data[:counterDelimited] = helpers.number_with_delimiter(counter_param.to_i)
         @page_link_data[:totalRaw] = response.total

data/app/controllers/concerns/blacklight/searchable.rb

@@ -21,7 +21,7 @@ module Blacklight::Searchable
 
   # @return [Blacklight::SearchService]
   def search_service
-    search_service_class.new(config: blacklight_config, search_state: search_state, user_params: search_state.to_h, **search_service_context)
+    search_service_class.new(config: blacklight_config, search_state: search_state, **search_service_context)
   end
 
   # Override this method on the class that includes Blacklight::Searchable to provide more context to the search service if necessary.

data/app/helpers/blacklight/configuration_helper_behavior.rb

@@ -96,7 +96,7 @@ module Blacklight::ConfigurationHelperBehavior
   #
   # @param [Blacklight::Solr::Configuration::Field] field_config
   # @return [Boolean]
-  def should_render_field?(field_config, *args)
-    blacklight_configuration_context.evaluate_if_unless_configuration field_config, *args
+  def should_render_field?(field_config, *)
+    blacklight_configuration_context.evaluate_if_unless_configuration(field_config, *)
   end
 end

data/app/helpers/blacklight/document_helper_behavior.rb

@@ -38,10 +38,12 @@ module Blacklight::DocumentHelperBehavior
 
   ##
   # Check if the document is in the user's bookmarks
+  # Note: we do string comparison of the classes, because hot reloading in the development environment may cause each to have
+  #       separate versions of the class loaded (see document.class.object_id and Bookmark#document_type.object_id)
   # @param [Blacklight::Document] document
   # @return [Boolean]
   def bookmarked? document
-    current_bookmarks.any? { |x| x.document_id == document.id && x.document_type == document.class }
+    current_bookmarks.any? { |x| x.document_id == document.id && x.document_type.to_s == document.class.to_s }
   end
 
   ##

data/app/helpers/blacklight/facets_helper_behavior.rb

@@ -7,6 +7,15 @@ module Blacklight::FacetsHelperBehavior
     facet_config.presenter.new(facet_config, display_facet, self)
   end
 
+  def search_facet_path(options = {})
+    opts = search_state
+           .to_h
+           .merge(action: "facet", only_path: true)
+           .merge(options)
+           .except(:page)
+    url_for opts
+  end
+
   private
 
   def facet_value_for_facet_item item

data/app/helpers/blacklight/icon_helper_behavior.rb

@@ -7,7 +7,7 @@ module Blacklight::IconHelperBehavior
   # Returns the raw SVG (String) for a Blacklight Icon
   # @param [String, Symbol] icon_name
   # @return [String]
-  def blacklight_icon(icon_name, **kwargs)
-    render "Blacklight::Icons::#{icon_name.to_s.camelize}Component".constantize.new(**kwargs)
+  def blacklight_icon(icon_name, **)
+    render "Blacklight::Icons::#{icon_name.to_s.camelize}Component".constantize.new(**)
   end
 end

data/app/javascript/blacklight-frontend/checkbox_submit.js

@@ -36,6 +36,9 @@ export default class CheckboxSubmit {
     }).then((json) => {
       this.labelTarget.removeAttribute('disabled')
       this.checkboxTarget.removeAttribute('disabled')
+      // For accessibility return keyboard focus 
+      // back to the checkbox after form submission
+      this.checkboxTarget.focus()
       this.updateStateFor(!this.checked)
       this.bookmarksCounter().forEach(counter => {
         counter.innerHTML = json.bookmarks.count;

data/app/javascript/blacklight-frontend/debounce.js

@@ -3,7 +3,7 @@
 // const basicFunction = (entry) => console.log(entry)
 // const debounced = debounce(basicFunction("I should only be called once"));
 //
-// debounced // does NOT print to the screen becase it is invoked again less than 200 milliseconds later
+// debounced // does NOT print to the screen because it is invoked again less than 200 milliseconds later
 // debounced // does print to the screen
 // ```
 export default function debounce(func, timeout = 200) {

data/app/javascript/blacklight-frontend/facet_suggest.js

@@ -4,20 +4,40 @@ const FacetSuggest = async (e) => {
   if (e.target.matches('.facet-suggest')) {
     const queryFragment = e.target.value?.trim();
     const facetField = e.target.dataset.facetField;
+    const facetArea = document.querySelector('.facet-extended-list');
+    const prevNextLinks = document.querySelectorAll('.prev_next_links');
+
     if (!facetField) { return; }
 
-    const urlToFetch = `/catalog/facet_suggest/${facetField}/${queryFragment}${window.location.search}`
+    // Get the search params from the current query so the facet suggestions
+    // can retain that context.
+    const facetSearchContext = e.target.dataset.facetSearchContext;
+    const url = new URL(facetSearchContext, window.location.origin);
+
+    // Drop facet.page so a filtered suggestion list will always start on page 1
+    url.searchParams.delete('facet.page');
+    const facetSearchParams = url.searchParams.toString();
+
+    const urlToFetch = `/catalog/facet_suggest/${facetField}/${queryFragment}?${facetSearchParams}`;
+
     const response = await fetch(urlToFetch);
     if (response.ok) {
         const blob = await response.blob()
         const text = await blob.text()
 
-        const facetArea = document.querySelector('.facet-extended-list');
-
         if (text && facetArea) {
             facetArea.innerHTML = text
         }
     }
+
+    // Hide the prev/next links when a user enters text in the facet
+    // suggestion input. They don't work with a filtered list.
+    prevNextLinks.forEach(element => {
+      element.classList.toggle('invisible', !!queryFragment);
+    });
+
+    // Add a class to distinguish suggested facet values vs. regular.
+    facetArea.classList.toggle('facet-suggestions', !!queryFragment);
   }
 };
 

data/app/javascript/blacklight-frontend/index.js

@@ -2,7 +2,6 @@ import BookmarkToggle from 'blacklight-frontend/bookmark_toggle'
 import ButtonFocus from 'blacklight-frontend/button_focus'
 import FacetSuggest from 'blacklight-frontend/facet_suggest'
 import Modal from 'blacklight-frontend/modal'
-import ModalForm from 'blacklight-frontend/modalForm'
 import SearchContext from 'blacklight-frontend/search_context'
 import Core from 'blacklight-frontend/core'
 
@@ -11,7 +10,6 @@ export default {
   ButtonFocus,
   FacetSuggest,
   Modal,
-  ModalForm,
   SearchContext,
   Core,
   onLoad: Core.onLoad

data/app/javascript/blacklight-frontend/modal.js

@@ -56,9 +56,6 @@
 const Modal = (() => {
   const modal = {}
 
-  // bootstrap class that will stop body scrolling when modal is open
-  const bootstrapBodyClassOpen = "modal-open";
-
   // a Bootstrap modal div that should be already on the page hidden
   modal.modalSelector = '#blacklight-modal';
 
@@ -137,7 +134,7 @@ const Modal = (() => {
 
   modal.modalAjaxLinkClick = function(e) {
     e.preventDefault();
-    const href = e.target.getAttribute('href')
+    const href = e.target.closest('a').getAttribute('href')
     fetch(href)
       .then(response => {
          if (!response.ok) {

data/app/javascript/blacklight-frontend/search_context.js

@@ -1,6 +1,7 @@
 const SearchContext = (e) => {
-  if (e.target.matches('[data-context-href]')) {
-    SearchContext.handleSearchContextMethod.call(e.target, e)
+  const contextLink = e.target.closest('[data-context-href]')
+  if (contextLink) {
+    SearchContext.handleSearchContextMethod.call(contextLink, e)
   }
 }
 

data/app/models/facet_search_builder.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+class FacetSearchBuilder < Blacklight::FacetSearchBuilder
+  include Blacklight::Solr::FacetSearchBuilderBehavior
+end

data/app/presenters/blacklight/facet_field_presenter.rb

@@ -4,7 +4,7 @@ module Blacklight
   class FacetFieldPresenter
     attr_reader :facet_field, :display_facet, :view_context, :search_state
 
-    delegate :key, to: :facet_field
+    delegate :key, :suggest, to: :facet_field
     delegate :field_name, to: :display_facet
 
     def initialize(facet_field, display_facet, view_context, search_state = view_context.search_state)

data/app/presenters/blacklight/json_presenter.rb

@@ -13,9 +13,7 @@ module Blacklight
 
     delegate :facet_field_names, :facet_configuration_for_field, to: :blacklight_config
 
-    def documents
-      @response.documents
-    end
+    delegate :documents, to: :@response
 
     # @return [Array<Blacklight::Solr::Response::Facets::FacetField>]
     def search_facets

data/app/presenters/blacklight/rendering/helper_method.rb

@@ -15,10 +15,10 @@ module Blacklight
 
       def render_helper
         context.send(config.helper_method,
-                     **options.merge(document: document,
-                                     field: config.field,
-                                     config: config,
-                                     value: values))
+                     **options, document: document,
+                                field: config.field,
+                                config: config,
+                                value: values)
       end
     end
   end

data/app/presenters/blacklight/rendering/join.rb

@@ -16,8 +16,8 @@ module Blacklight
 
       private
 
-      def html_escape(*args)
-        ERB::Util.html_escape(*args)
+      def html_escape(*)
+        ERB::Util.html_escape(*)
       end
     end
   end

data/app/services/blacklight/facet_search_service.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+# FacetSearchService returns a facet list from the repository. This is for drawing the "more facets" modal
+module Blacklight
+  class FacetSearchService
+    def initialize(config:, search_state:, search_builder_class: config.facet_search_builder_class, **context)
+      @blacklight_config = config
+      @search_state = search_state
+      @user_params = @search_state.params
+      @search_builder_class = search_builder_class
+      @context = context
+    end
+
+    # The blacklight_config + controller are accessed by the search_builder
+    attr_reader :blacklight_config, :context
+
+    def search_builder
+      search_builder_class.new(self)
+    end
+
+    def search_state_class
+      @search_state.class
+    end
+
+    ##
+    # Get the solr response when retrieving only a single facet field
+    # @return [Blacklight::Solr::Response] the solr response
+    def facet_field_response(facet_field, extra_controller_params = {})
+      query = search_builder.with(search_state).facet(facet_field)
+      repository.search(params: query.merge(extra_controller_params))
+    end
+
+    def facet_suggest_response(facet_field, facet_suggestion_query, extra_controller_params = {})
+      query = search_builder.with(search_state).facet(facet_field).facet_suggestion_query(facet_suggestion_query)
+      repository.search(params: query.merge(extra_controller_params))
+    end
+
+    private
+
+    attr_reader :search_builder_class, :search_state
+
+    delegate :repository, to: :blacklight_config
+  end
+end

data/app/services/blacklight/field_retriever.rb

@@ -41,7 +41,7 @@ module Blacklight
 
     def retrieve_simple
       # regular document field
-      if field_config.default && field_config.default.is_a?(Proc)
+      if field_config.default.is_a?(Proc)
         document.fetch(field_config.field, &field_config.default)
       else
         document.fetch(field_config.field, field_config.default)

data/app/services/blacklight/search_service.rb

@@ -3,9 +3,9 @@
 # SearchService returns search results from the repository
 module Blacklight
   class SearchService
-    def initialize(config:, search_state: nil, user_params: nil, search_builder_class: config.search_builder_class, **context)
+    def initialize(config:, search_state:, search_builder_class: config.search_builder_class, **context)
       @blacklight_config = config
-      @search_state = search_state || Blacklight::SearchState.new(user_params || {}, config)
+      @search_state = search_state
       @user_params = @search_state.params
       @search_builder_class = search_builder_class
       @context = context
@@ -31,7 +31,7 @@ module Blacklight
       builder.rows = search_state.per_page
 
       builder = yield(builder) if block_given?
-      response = repository.search(builder)
+      response = repository.search(params: builder)
 
       if response.grouped? && grouped_key_for_results
         response.group(grouped_key_for_results)
@@ -59,12 +59,12 @@ module Blacklight
     # @return [Blacklight::Solr::Response] the solr response
     def facet_field_response(facet_field, extra_controller_params = {})
       query = search_builder.with(search_state).facet(facet_field)
-      repository.search(query.merge(extra_controller_params))
+      repository.search(params: query.merge(extra_controller_params))
     end
 
     def facet_suggest_response(facet_field, facet_suggestion_query, extra_controller_params = {})
       query = search_builder.with(search_state).facet(facet_field).facet_suggestion_query(facet_suggestion_query)
-      repository.search(query.merge(extra_controller_params))
+      repository.search(params: query.merge(extra_controller_params))
     end
 
     # Get the previous and next document from a search result
@@ -73,7 +73,7 @@ module Blacklight
       p = previous_and_next_document_params(index)
       new_state = request_params.is_a?(Blacklight::SearchState) ? request_params : Blacklight::SearchState.new(request_params, blacklight_config)
       query = search_builder.with(new_state).start(p.delete(:start)).rows(p.delete(:rows)).merge(extra_controller_params).merge(p)
-      response = repository.search(query)
+      response = repository.search(params: query)
       document_list = response.documents
 
       # only get the previous doc if there is one

data/app/values/blacklight/types.rb

@@ -95,8 +95,8 @@ module Blacklight
     end
 
     class Selector < Array
-      def initialize(by: nil, block: nil, **kwargs)
-        super(**kwargs)
+      def initialize(by: nil, block: nil, **)
+        super(**)
         @by = by
         @block = block
       end

data/app/views/catalog/_facet_pivot.html.erb

@@ -1,3 +1,3 @@
-<%= render(Blacklight::FacetFieldListComponent.new(
+<%= render(Blacklight::Facets::ListComponent.new(
       facet_field: facet_field_presenter(facet_field.merge(item_component: Blacklight::FacetItemPivotComponent), display_facet),
       layout: false)) %>

data/app/views/catalog/_home_text.html.erb

@@ -1,5 +1,5 @@
-<div class="jumbotron text-center p-5 mb-4 bg-light rounded-3">
-  <h1 class="jumbotron-heading"><%= t('blacklight.welcome') %></h1>
+<div class="text-center p-5 mb-4 bg-light rounded-3">
+  <h1 class="fw-bold"><%= t('blacklight.welcome') %></h1>
 
   <p class="lead">Blacklight is a multi-institutional open-source collaboration building a better discovery platform framework.</p>
 

data/app/views/catalog/_sort_and_per_page.html.erb

@@ -1,4 +1,4 @@
-<div id="sortAndPerPage" class="sort-pagination pb-3 d-md-flex justify-content-between" role="navigation" aria-label="<%= t('blacklight.search.per_page.aria_label')%>">
+<div id="sortAndPerPage" class="sort-pagination pb-3 mb-3 d-md-flex justify-content-between" role="navigation" aria-label="<%= t('blacklight.search.per_page.aria_label')%>">
   <%= render partial: "paginate_compact", object: @response if show_pagination? %>
   <%= render_results_collection_tools wrapping_class: "search-widgets" %>
 </div>

data/app/views/catalog/facet.html.erb

@@ -1,14 +1,12 @@
 <%= render Blacklight::System::ModalComponent.new do |component| %>
-  <% component.with_prefix do %>
-    <div class="facet-pagination top d-flex w-100 justify-content-between">
-      <%= render :partial=>'facet_pagination' %>
-    </div>
-  <% end %>
-
   <% component.with_title { facet_field_label(@facet.key) } %>
-  <%= render Blacklight::Search::FacetSuggestInput.new(facet: @facet, presenter: @presenter) %>
+  <% view_config = blacklight_config.view_config(document_index_view_type) %>
 
-  <%= render partial: 'facet_index_navigation' if @facet.index_range && @display_facet.index? %>
+  <%= render Blacklight::Facets::FiltersComponent.new(presenter: @presenter) %>
+
+  <div class="facet-pagination top d-flex flex-wrap w-100 justify-content-between border-bottom pb-3 mb-3">
+    <%= render view_config.facet_pagination_component.new(facet_field: @presenter) %>
+  </div>
 
   <div class="facet-extended-list">
     <%= render Blacklight::FacetComponent.new(display_facet: @display_facet,
@@ -17,8 +15,8 @@
   </div>
 
   <% component.with_footer do %>
-    <div class="facet-pagination bottom flex-row justify-content-between">
-      <%= render :partial=>'facet_pagination' %>
+    <div class="facet-pagination bottom d-flex flex-wrap w-100 justify-content-between">
+      <%= render view_config.facet_pagination_component.new(facet_field: @presenter) %>
     </div>
   <% end %>
 <% end %>

data/config/locales/blacklight.ar.yml

@@ -112,8 +112,8 @@ ar:
           count: ترتيب رقمي
           index: ترتيب أبجدي
         suggest:
-          label: Filter %{field_label}
-          placeholder: Filter...
+          label: الفلتر %{field_label}
+          placeholder: فلتر...
         title: تحديد نطاق البحث
       filters:
         label: "%{label}:"

data/config/locales/blacklight.es.yml

@@ -102,8 +102,8 @@ es:
           count: Ordenación numérica
           index: Ordenación A-Z
         suggest:
-          label: Filter %{field_label}
-          placeholder: Filter...
+          label: Filtro %{field_label}
+          placeholder: Filtrar...
         title: Limite su búsqueda
       filters:
         label: "%{label}:"

data/config/locales/blacklight.fr.yml

@@ -102,8 +102,8 @@ fr:
           count: Du + au - fréquent
           index: Tri de A à Z
         suggest:
-          label: Filter %{field_label}
-          placeholder: Filter...
+          label: Filtre %{field_label}
+          placeholder: Filtre...
         title: Limiter votre recherche
       filters:
         label: "%{label}:"

data/config/locales/blacklight.hu.yml

@@ -100,8 +100,8 @@ hu:
           count: Numerikus rendezés
           index: A-Z rendezés
         suggest:
-          label: Filter %{field_label}
-          placeholder: Filter...
+          label: Szűrő %{field_label}
+          placeholder: Szűrő...
         title: Szűrje tovább a keresését
       filters:
         label: "%{label}:"

data/config/locales/blacklight.it.yml

@@ -103,8 +103,8 @@ it:
           count: Ordina per numero
           index: Ordina A-Z
         suggest:
-          label: Filter %{field_label}
-          placeholder: Filter...
+          label: Filtro %{field_label}
+          placeholder: Filtro...
         title: Affina la ricerca
       filters:
         label: "%{label}:"

data/config/locales/blacklight.nl.yml

@@ -100,7 +100,7 @@ nl:
           count: Numeriek sorteren
           index: A-Z Sorteren
         suggest:
-          label: Filter %{field_label}
+          label: Filteren %{field_label}
           placeholder: Filter...
         title: Verfijn uw zoekopdracht
       filters:

data/config/locales/blacklight.pt-BR.yml

@@ -101,8 +101,8 @@ pt-BR:
           count: Ordenar por Número
           index: Ordem Alfabética A-Z
         suggest:
-          label: Filter %{field_label}
-          placeholder: Filter...
+          label: Filtro %{field_label}
+          placeholder: Filtro...
         title: Filtre sua busca
       filters:
         label: "%{label}:"

data/config/locales/blacklight.sq.yml

@@ -100,8 +100,8 @@ sq:
           count: Renditja numerike
           index: A-Z Renditja
         suggest:
-          label: Filter %{field_label}
-          placeholder: Filter...
+          label: Filtri %{field_label}
+          placeholder: Filtro...
         title: Kufizo këkimin
       filters:
         label: "%{label}:"