card 1.97.0.1 → 1.98.0

data/mod/search/set/abstract/03_filter/_filter_input.haml

@@ -0,0 +1,8 @@
+._filter-input.filter-input-group.input-group.input-group-sm{"data-category": key, "class": "_filter-input-#{key}" }
+  .input-group-prepend.filter-input-prepend
+    %button.btn.btn-secondary.input-group-text.p-1._delete-filter-input{:type => "button"}
+      %small.text-muted
+        = fa_icon :times
+    %span.input-group-text._selected-category.text-muted
+      = category[:label]
+  = category[:input_field]

data/mod/search/set/abstract/03_filter/filter_form.haml

@@ -0,0 +1,53 @@
+
+.card.w-100.nodblclick
+  .card-body
+    ._filter-widget
+      // FILTERING PROTOTYPES
+      ._filter-input-field-prototypes.d-none
+        - categories.each do |key, category|
+          = haml_partial :filter_input, key: key, category: category
+
+
+      // FORM
+      %form._filter-form{form_args, "accept-charset": "UTF-8",
+                                    "data-remote": "true",
+                                    method: "get"}
+        - not_ids = params.dig :filter, :not_ids
+        %input{ type: :hidden, name: "filter[not_ids]", class: "_not-ids", value: not_ids }
+        .d-flex.flex-wrap
+          = render_quick_filters
+          - if sort_input_field.present?
+            // SORTING
+            .sort-in-filter-form
+              %i.fa.fa-sort.filter-section-icon
+              .input-group.input-group-sm.flex-nowrap.sort-input-group.mb-2.mr-2
+                .input-group-prepend
+                  %span.input-group-text.text-muted Sort
+                = sort_input_field
+
+          // FILTERING
+          .filter-in-filter-form
+            %i.fa.fa-filter.filter-section-icon
+            ._filter-container.d-flex.flew-row.flex-wrap
+              // FILTERS inserted here
+
+              // ADD FILTER DROPDOWN
+              .dropdown._add-filter-dropdown.mr-2
+                %button.btn.btn-sm.btn-primary.dropdown-toggle{"aria-expanded": "false",
+                                                               "aria-haspopup": "true",
+                                                               "data-toggle": "dropdown",
+                                                               type: "button" }
+                  More Filters
+                .dropdown-menu
+                  - categories.each do |key, category|
+                    %a.dropdown-item._filter-category-select{"data-category": key,
+                                                             "data-label": category[:label],
+                                                             "data-active": ("true" if category[:active]),
+                                                             "data-default": ("true" if category[:default]),
+                                                             :href => "#"}
+                      = category[:label]
+
+              // RESET BUTTON
+              ._reset-filter
+                %button.btn.btn-sm.btn-secondary{type: "button"}
+                  %i.fa.fa-refresh

data/mod/search/set/abstract/03_filter/filter_form.rb

@@ -0,0 +1,77 @@
+format :html do
+  # sort and filter ui
+  view :filter_form, cache: :never do
+    filter_fields slot_selector: "._filter-result-slot",
+                  sort_field: _render(:sort_formgroup)
+  end
+
+  view :quick_filters do
+    return "" unless quick_filter_list.present?
+
+    haml :quick_filters
+  end
+
+  def quick_filter_list
+    []
+  end
+
+  # @param data [Hash] the filter categories. The hash needs for every category
+  #   a hash with a label and a input_field entry.
+  def filter_form data={}, sort_input_field=nil, form_args={}
+    haml :filter_form, categories: data,
+                       sort_input_field: sort_input_field,
+                       form_args: form_args
+  end
+
+  def filter_fields slot_selector: nil, sort_field: nil
+    form_args = { action: filter_action_path, class: "slotter" }
+    form_args["data-slot-selector"] = slot_selector if slot_selector
+    filter_form filter_form_data, sort_field, form_args
+  end
+
+  def filter_form_data
+    all_filter_keys.each_with_object({}) do |cat, h|
+      h[cat] = { label: filter_label(cat),
+                 input_field: _render("filter_#{cat}_formgroup"),
+                 active: active_filter?(cat),
+                 default: default_filter?(cat) }
+    end
+  end
+
+  def active_filter? field
+    if card.filter_keys_from_params.present?
+      filter_hash.key? field
+    else
+      default_filter? field
+    end
+  end
+
+  def default_filter? field
+    card.default_filter_hash.key?(field)
+  end
+
+  def filter_label field
+    # return "Keyword" if field.to_sym == :name
+    #
+    filter_label_from_method(field) || filter_label_from_name(field)
+  end
+
+  def filter_label_from_method field
+    try "#{field}_filter_label"
+  end
+
+  def filter_label_from_name field
+    Card.fetch_name(field) { field.to_s.titleize }
+  end
+
+  def filter_action_path
+    path
+  end
+
+  view :sort_formgroup, cache: :never do
+    select_tag "sort",
+               options_for_select(sort_options, card.current_sort),
+               class: "pointer-select _filter-sort form-control",
+               "data-minimum-results-for-search": "Infinity"
+  end
+end

data/mod/search/set/abstract/03_filter/filtered_content.haml

@@ -0,0 +1,5 @@
+._filtered-content.nodblclick
+  .filter-form
+    = render_filter_form
+  .filtered-results
+    = render_content hide: :menu, home_view: :content

data/mod/search/set/abstract/{01_filter_form_helper.rb → 03_filter/form_helper.rb}

@@ -5,10 +5,6 @@ format :html do
     text_filter :name
   end
 
-  def sort_options
-    {}
-  end
-
   def select_filter field, default=nil, options=nil
     options ||= filter_options field
     options.unshift(["--", ""]) unless default
@@ -21,11 +17,34 @@ format :html do
   end
 
   def text_filter field, opts={}
-    name = filter_name field
+    text_filter_with_name_and_value filter_name(field), filter_param(field), opts
+  end
+
+  def text_filter_with_name_and_value name, value, opts
+    opts[:class] ||= "simple-text"
     add_class opts, "form-control"
-    # formgroup filter_label(field), class: "filter-input" do
-    text_field_tag name, filter_param(field), opts
-    # end
+    text_field_tag name, value, opts
+  end
+
+  def range_filter field, opts={}
+    add_class opts, "simple-text range-filter-subfield"
+    output [range_sign(:from),
+            sub_text_filter(field, :from, opts),
+            range_sign(:to),
+            sub_text_filter(field, :to, opts)]
+  end
+
+  def range_sign side
+    dir = side == :from ? "right" : "left"
+    wrap_with :span, class: "input-group-prepend" do
+      fa_icon("chevron-circle-#{dir}", class: "input-group-text")
+    end
+  end
+
+  def sub_text_filter field, subfield, opts={}
+    name = "filter[#{field}][#{subfield}]"
+    value = filter_hash.dig field, subfield
+    text_filter_with_name_and_value name, value, opts
   end
 
   def select_filter_type_based type_codename, order="asc"
@@ -52,17 +71,20 @@ format :html do
 
   def select_filter_tag field, default, options, html_options={}
     name = filter_name field, html_options[:multiple]
-    default = filter_param(field) || default
-    options = options_for_select(options, default)
-
-    css_class =
-      html_options[:multiple] ? "pointer-multiselect" : "pointer-select"
-    add_class(html_options,
-              css_class + " filter-input #{field} _filter_input_field form-control")
-
+    options = options_for_select options, (filter_param(field) || default)
+    normalize_select_filter_tag_html_options field, html_options
     select_tag name, options, html_options
   end
 
+  # alters html_options hash
+  def normalize_select_filter_tag_html_options field, html_options
+    pointer_suffix = html_options[:multiple] ? "multiselect" : "select"
+    add_class html_options, "pointer-#{pointer_suffix} filter-input #{field} " \
+                            "_filter_input_field _no-select2 form-control"
+    # _no-select2 because select is initiated after filter is opened.
+    html_options[:id] = "filter-input-#{unique_id}"
+  end
+
   def filter_name field, multi=false
     "filter[#{field}]#{'[]' if multi}"
   end
@@ -74,7 +96,7 @@ format :html do
 
   def option_hash_to_array hash
     hash.each_with_object([]) do |(key, value), array|
-      array << [key, value.to_s.downcase]
+      array << [key, value.to_s]
       array
     end
   end

data/mod/search/set/abstract/03_filter/query_construction.rb

@@ -0,0 +1,36 @@
+# all filter keys in the order they were selected
+def all_filter_keys
+  @all_filter_keys ||= filter_keys_from_params | filter_keys
+end
+
+def filter_and_sort_wql
+  filter_wql.merge(sort_wql)
+end
+
+def filter_wql
+  return {} if filter_hash.empty?
+
+  filter_wql_from_params
+end
+
+# separate method is needed for tests
+def filter_wql_from_params
+  filter_class.new(filter_keys_with_values, blocked_id_wql).to_wql
+end
+
+def sort_wql
+  sort_hash
+end
+
+def blocked_id_wql
+  not_ids = filter_param :not_ids
+  not_ids.present? ? { id: ["not in", not_ids.split(",")] } : {}
+end
+
+def current_sort
+  sort_param || default_sort_option
+end
+
+def default_sort_option
+  wql_content[:sort]
+end

data/mod/search/set/abstract/03_filter/quick_filters.haml

@@ -0,0 +1,14 @@
+.quick-filter._quick-filter
+  %i.fa.fa-bolt.filter-section-icon
+  .quick-filter-links.d-flex.flex-wrap
+    - quick_filter_list.each do |hash|
+      - link_hash = JSON(hash)
+      - filter_key = hash.keys.first
+      - value = hash.values.first
+      %a{ "data-filter": link_hash,
+          href: "#",
+          class: "quick-filter-by-#{filter_key}",
+          title: "Quick Filter" }
+        = mapped_icon_tag filter_key
+        // FIXME: mapped_icon_tag is WikiRate concept
+        = value

data/mod/search/set/abstract/04_right_filter_form.rb

@@ -4,7 +4,7 @@
 include_set Set::Abstract::Filter
 
 def virtual?
-  true
+  new?
 end
 
 format :html do
@@ -13,10 +13,14 @@ format :html do
   end
 
   view :core, cache: :never do
-    filter_fields slot_selector: ".filter_result-view"
+    filter_fields slot_selector: filter_selector
   end
 
   def filter_view
     :filter_result
   end
+
+  def filter_selector
+    ".#{filter_view}-view"
+  end
 end

data/mod/search/set/abstract/search.rb

@@ -63,12 +63,13 @@ format do
   def search_with_rescue query_args
     card.cached_search query_args
   rescue Error::BadQuery => e
+    Rails.logger.info "BadQuery: #{query_args}"
     e
   end
 
   def implicit_item_view
     view = voo_items_view || item_view_from_query || default_item_view
-    Card::View.canonicalize view
+    Card::View.normalize view
   end
 
   # override if query can specify item view

data/mod/search/set/abstract/search/views.rb

@@ -27,8 +27,9 @@ format :json do
     search_with_params
   end
 
+  # NOCACHE because paging_urls is uncacheable hash and thus not safe to merge
   view :molecule, cache: :never do
-    super().merge paging_urls
+    molecule.merge render_paging_urls
   end
 
   # TODO: design better autocomplete API
@@ -85,7 +86,7 @@ format :data do
 end
 
 format :csv do
-  view :core, mod: All::AllCsv::CsvFormat
+  view :core, :core, mod: All::AllCsv::CsvFormat
 
   view :card_list do
     items = super()
@@ -98,7 +99,7 @@ format :csv do
 end
 
 format :html do
-  view :card_list do
+  view :card_list, cache: :never do
     with_results do
       search_result_list "search-result-list" do |item_card|
         card_list_item item_card

data/mod/search/set/abstract/wql_search.rb

@@ -43,15 +43,15 @@ def standardized_query_args args
   args
 end
 
-# override this to define search
 def wql_hash
   @wql_hash = nil unless cache_query?
-  @wql_hash ||= wql_from_content.merge filter_and_sort_wql
+  @wql_hash ||= wql_content.merge filter_and_sort_wql
 end
 
-def wql_from_content
-  @wql_from_content = nil unless cache_query?
-  @wql_from_content ||= begin
+# override this to define search
+def wql_content
+  @wql_content = nil unless cache_query?
+  @wql_content ||= begin
     query = content
     query = query.is_a?(Hash) ? query : parse_json_query(query)
     query.symbolize_keys

data/mod/search/set/self/recent.rb

@@ -1,7 +1,7 @@
 ACTS_PER_PAGE = 25
 
 view :title do
-  voo.title = "Recent Changes"
+  voo.title ||= "Recent Changes"
   super()
 end
 

data/mod/search/spec/set/abstract/filter_spec.rb

@@ -1,4 +1,4 @@
-describe Card::Set::Abstract::Filter do
+RSpec.describe Card::Set::Abstract::Filter do
   subject do
     search_card = Card.new type: "Search"
     search_card.format.filter_form a: { input_field: "<input id='a'/>", label: "A" },
@@ -10,29 +10,23 @@ describe Card::Set::Abstract::Filter do
   specify "#filter_form" do
     is_expected.to have_tag "._filter-widget" do
       with_tag "div._filter-input-field-prototypes" do
-        with_tag "div._filter-input-field.a" do
+        with_tag "div._filter-input-a" do
           with_tag "input#a"
         end
-        with_tag "div._filter-input-field.b" do
+        with_tag "div._filter-input-b" do
           with_tag "select#b"
         end
-        with_tag "div._filter-input-field.c" do
-          without_tag "select"
-        end
-      end
-
-      with_tag "div._filter-container" do
-        with_tag "div.input-group" do
-          with_tag "span._selected-category", text: /C/
+        with_tag "div._filter-input-c" do
           with_tag "select#c"
         end
       end
 
+      with_tag "div._filter-container"
+
       with_tag "div.dropdown._add-filter-dropdown" do
         with_tag "a.dropdown-item", with: { "data-category": "a" }
         with_tag "a.dropdown-item", with: { "data-category": "b" }
-        with_tag "a.dropdown-item", with: { "data-category": "c",
-                                            style: "display: none;" }
+        with_tag "a.dropdown-item", with: { "data-category": "c", "data-active": "true" }
       end
     end
   end

data/mod/search/template/abstract/search/select_item.haml

@@ -3,12 +3,13 @@
     Select Item
     .badge.badge-secondary
       = card.count
-.filter-selector.p-3
+.filter-selector.p-2
   - if card.count > 0
-    %input#select-all._select-all{name: "", type: "checkbox", value: ""}
-    %label{for: "select-all"}
-      select
-      %span._unselected-items
-        = search_with_params.size
-      following
+    .filter-bulk-selector.pb-3
+      %input#select-all._select-all{name: "", type: "checkbox", value: ""}
+      %label{for: "select-all"}
+        select
+        %span._unselected-items
+          = search_with_params.size
+        following
   = render :checkbox_list