Merge pull request #402 from trln/td-1278-adv-search-edit-facet-select

Td 1278 adv search edit facet select

Dockerfile

@@ -1,6 +1,7 @@
-FROM ruby:2.7.5 AS app_bootstrap
+ARG RUBY_VERSION=2.7.6
+FROM ruby:${RUBY_VERSION} AS app_bootstrap
 
-RUN apt-get update && apt-get install -y nodejs vim tree
+RUN apt-get update && apt-get install -y nodejs vim less
 
 FROM app_bootstrap AS builder
 
@@ -10,11 +11,9 @@ COPY lib/trln_argon/version.rb /build/lib/trln_argon/version.rb
 
 WORKDIR /build
 
-RUN tree
-
 RUN $(./bundler_config.rb path /gems) && bundle install -j $(nproc)
 
-FROM app_bootstrap
+FROM app_bootstrap AS runnable
 
 COPY --from=builder /gems /gems
 COPY ./bundler_config.rb .

VERSION

@@ -1 +1 @@
-2.2.9
+2.2.10

app/components/trln_argon/advanced_search_facet_field_component.html.erb

@@ -5,7 +5,7 @@
   <div class="col-12 col-md-9">
     <select multiple="multiple" name="<%= field_param %>" id="<%= facet_field.key %>" class="form-control custom-select advanced-search-facet-select">
     <% facet_field.display_facet.items.each do |item| %>
-     <option value="<%= item.value %>"><%= display_value(item) %></option>
+     <option value="<%= item.value %>"<%= selected?(item) %>><%= display_value(item) %></option>
      <% end %>
     </select>
   </div>

app/components/trln_argon/advanced_search_facet_field_component.rb

@@ -18,6 +18,10 @@ def display_value(facet_item)
       "#{facet_value_label(facet_item)}  (#{number_with_delimiter facet_item.hits})".html_safe
     end
 
+    def selected?(item)
+      ' selected="selected"' if params[:f_inclusive]&.fetch(facet_field.key, [])&.include?(item.value)
+    end
+
     def render?
       !!display_facet&.items
     end

entrypoint.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 check_bundle() {
-    bundle check || bundle install -j "$(nproc)"
+    bundle config set path /gems && bundle check || bundle install -j "$(nproc)"
 }
 
 cd /app || exit

lib/trln_argon/controller_override.rb

@@ -635,10 +635,10 @@ def action_documents
         [solr_response, solr_response.documents]
       end
 
-      # rubocop:disable Style/PredicateName
+      # rubocop:disable Naming/PredicateName
       def has_search_parameters?
         %i[q f op seach_field range doc_ids].any? { |p| params[p].present? }
-        # rubocop:enable Style/PredicateName
+        # rubocop:enable Naming/PredicateName
       end
 
       def query_has_constraints?(localized_params = params)
@@ -653,11 +653,12 @@ def query_has_constraints?(localized_params = params)
         end
       end
 
-      # rubocop:disable Style/PredicateName
+      # rubocop:disable Naming/PredicateName
       def is_advanced_search?(req_params = params)
         (req_params[:search_field] == blacklight_config.advanced_search[:url_key]) ||
           req_params[:f_inclusive]
       end
+      # rubocop:enable Naming/PredicateName
 
       def render_ris_action?
         doc = @document || (@document_list || []).first