card 1.97.0.1 → 1.98.0

data/mod/{standard/spec/set/type/listed_by_spec.rb → pointer/spec/set/type/mirror_list_spec.rb}

@@ -1,27 +1,19 @@
 # -*- encoding : utf-8 -*-
 
-RSpec.describe Card::Set::Type::ListedBy do
+RSpec.describe Card::Set::Type::MirrorList do
   let(:listed_by) { Card.fetch("Darles Chickens+books").item_names.sort }
 
   before do
     Card::Auth.as_bot do
-      Card.create!(
-        name: "Parry Hotter+authors",
-        content: "[[Darles Chickens]]",
-        type: "list"
-      )
-      Card.create!(
-        name: "50 grades of shy+authors",
-        content: "[[Darles Chickens]]\n[[Stam Broker]]",
-        type: "list"
-      )
+      #create_mirrored_list "Parry Hotter+authors", "[[Darles Chickens]]"
+      Card.create! name: "Parry Hotter+authors", content: "[[Darles Chickens]]", type_id: Card::MirroredListID
+      Card.create! name: "50 grades of shy+authors", content: "[[Darles Chickens]]\n[[Stam Broker]]", type_id: Card::MirroredListID
+      #create_mirrored_list "50 grades of shy+authors", "[[Darles Chickens]]\n[[Stam Broker]]"
     end
   end
   it "doesn't allow non-cardtype as right part" do
     expect do
-      Card["Parry Hotter+authors"].update!(
-        name: "Parry Hotter+hidden"
-      )
+      Card["Parry Hotter+authors"].update!(name: "Parry Hotter+hidden")
     end.to raise_error(ActiveRecord::RecordInvalid,
                        /Name must have a cardtype name as right part/)
   end
@@ -62,7 +54,7 @@ RSpec.describe Card::Set::Type::ListedBy do
               name: "Adventures of Buckleharry Finn",
               type: "book",
               subcards: {
-                "+authors" => { content: "[[Darles Chickens]]", type: "list" }
+                "+authors" => { content: "[[Darles Chickens]]", type: "mirrored list" }
               }
             )
           end
@@ -81,7 +73,7 @@ RSpec.describe Card::Set::Type::ListedBy do
               name: "Adventures of Buckleharry Finn",
               type: "book",
               subcards: {
-                "+authors" => { content: "[[Stam Broker]]", type: "list" }
+                "+authors" => { content: "[[Stam Broker]]", type: "mirrored list" }
               }
             )
             Card.fetch("Adventures of Buckleharry Finn+authors")

data/mod/{standard/spec/set/type/list_spec.rb → pointer/spec/set/type/mirrored_list_spec.rb}

@@ -1,16 +1,12 @@
 # -*- encoding : utf-8 -*-
 
-RSpec.describe Card::Set::Type::List do
+RSpec.describe Card::Set::Type::MirroredList do
   subject { Card.fetch("Parry Hotter+authors").item_names.sort }
 
   before do
     Card::Auth.as_bot do
-      Card.create! name: "Stam Broker+books", type: "listed by"
-      Card.create!(
-        name: "Parry Hotter+authors",
-        content: "[[Darles Chickens]]\n[[Stam Broker]]",
-        type: "list"
-      )
+      create_mirror_list "Stam Broker+books"
+      create_mirrored_list "Parry Hotter+authors", "[[Darles Chickens]]\n[[Stam Broker]]"
     end
   end
 
@@ -21,11 +17,8 @@ RSpec.describe Card::Set::Type::List do
   describe "Parry Hotter+authors" do
     context "when 'Parry Hotter' is added to Joe-Ann Rolwings's books" do
       before do
-        Card.create! name: "Joe-Ann Rolwing", type: "author"
-        Card.create!(
-          name: "Joe-Ann Rolwing+books", type: "listed by",
-          content: "[[Parry Hotter]]"
-        )
+        create_author "Joe-Ann Rolwing"
+        create_mirror_list "Joe-Ann Rolwing+books", "[[Parry Hotter]]"
       end
       it do
         is_expected.to eq(
@@ -36,7 +29,7 @@ RSpec.describe Card::Set::Type::List do
 
     context "when 'Parry Hotter' is dropped from Stam Brokers's books" do
       specify "Stam Broker is no longer an author of Parry Hotter", as_bot: true do
-        update "Stam Brokers+books", content: "[[50 grades of shy]]"
+        Card["Stam Brokers+books"].update! content: "[[50 grades of shy]]"
         expect(authors).to contain_exactly "Darles Chickens"
       end
     end
@@ -105,11 +98,11 @@ RSpec.describe Card::Set::Type::List do
       end
       it { is_expected.to eq ["Darles Chickens", "Stam Broker"] }
     end
-    context "when Parry Hotter+authors to Parry Hotter+basics" do
+    context "when Parry Hotter+authors to Parry Hotter+rich_text" do
       it "raises error because content is invalid" do
         expect do
           Card["Parry Hotter+authors"].update!(
-            name: "Parry Hotter+basics"
+            name: "Parry Hotter+rich_text"
           )
         end.to raise_error(ActiveRecord::RecordInvalid,
                            /Name name conflicts with list items/)
@@ -117,7 +110,7 @@ RSpec.describe Card::Set::Type::List do
     end
   end
 
-  describe "'listed by' entry added that doesn't have a list" do
+  describe "'mirror list' entry added that doesn't have a list" do
     context "when '50 grades of shy is added to Stam Broker's books" do
       before do
         Card["Stam Broker+books"].add_item! "50 grades of shy"

data/mod/rules/set/rule/bridge_rules_editor.rb

@@ -1,11 +1,12 @@
 format :html do
-  view :overlay_rule, cache: :never, tags: :unknown_ok do
+  view :overlay_rule, cache: :never, unknown: true do
     wrap_with_overlay slot: breadcrumb_data("Rule editing", "rules") do
       current_rule_form
     end
   end
 
-  view :modal_rule, cache: :never, tags: :unknown_ok, wrap: :modal do
+  view :modal_rule, cache: :never, unknown: true,
+                    wrap: { modal: { title: ->(format) { format.render_title } } } do
     current_rule_form
   end
 
@@ -13,7 +14,7 @@ format :html do
     edit_rule_title
   end
 
-  view :overlay_rule_help, tags: :unknown_ok, perms: :none, cache: :never do
+  view :overlay_rule_help, unknown: true, perms: :none, cache: :never do
     # wrap_with :div, class: "help-text rule-instruction d-flex justify-content-between"
     # do
 

data/mod/rules/set/rule/editor.rb

@@ -16,13 +16,13 @@ format :html do
     Card.new name: "#{Card[:all].name}+#{card.rule_user_setting_name}"
   end
 
-  view :rule_help, tags: :unknown_ok, perms: :none, cache: :never do
+  view :rule_help, unknown: true, perms: :none, cache: :never do
     wrap_with :div, class: "alert alert-info rule-instruction" do
       rule_based_help
     end
   end
 
-  view :show_rule, cache: :never, tags: :unknown_ok do
+  view :show_rule, cache: :never, unknown: true do
     return "No Current Rule" if card.new_card?
 
     voo.items[:view] ||= :link
@@ -38,7 +38,7 @@ format :html do
     end
   end
 
-  view :quick_edit, tags: :unknown_ok, template: :haml, wrap: :slot do
+  view :quick_edit, unknown: true, template: :haml, wrap: :slot do
     setting_title + short_help_text + quick_editor
   end
 
@@ -78,7 +78,7 @@ format :html do
     end
   end
 
-  view :rule_bridge_link, tags: :unknown_ok do
+  view :rule_bridge_link, unknown: true do
     opts = bridge_link_opts(class: "edit-rule-link nav-link",
                             "data-toggle": "pill",
                             "data-cy": "#{setting_title.to_name.key}-pill")

data/mod/rules/set/rule/rule_form.rb

@@ -1,5 +1,5 @@
 format :html do
-  view :rule_form, cache: :never, tags: :unknown_ok do
+  view :rule_form, cache: :never, unknown: true do
     @success_view ||= :open
     @rule_context ||= card
     @form_type ||= :overlay

data/mod/rules/set/rule/table.rb

@@ -1,5 +1,5 @@
 format :html do
-  view :open_rule, cache: :never, tags: :unknown_ok,
+  view :open_rule, cache: :never, unknown: true,
                    wrap: { modal: { size: :large,
                                     title: :edit_rule_title,
                                     footer: "" } } do
@@ -14,7 +14,7 @@ format :html do
   end
 
   # used in tables shown in set cards' core view
-  view :rule_row, cache: :never, tags: :unknown_ok do
+  view :rule_row, cache: :never, unknown: true do
     rule_card = find_existing_rule_card
     cols = %i[setting set]
     cols.insert(1, :content) if voo.show? :content

data/mod/rules/set/rule/table_row.rb

@@ -1,5 +1,5 @@
 format :html do
-  view :rule_link, tags: :unknown_ok do
+  view :rule_link, unknown: true do
     rule_card = find_existing_rule_card
     wrap_closed_rule rule_card do
       %i[link set].map do |cell|
@@ -8,7 +8,7 @@ format :html do
     end
   end
 
-  view :rule_modal_link, tags: :unknown_ok do
+  view :rule_modal_link, unknown: true do
     rule_card = find_existing_rule_card
       wrap_closed_rule rule_card do
         %i[modal_link set].map do |cell|
@@ -18,7 +18,7 @@ format :html do
   end
 
   def wrap_closed_rule rule_card
-    klass = rule_card&.real? ? "known-rule" : "missing-rule"
+    klass = rule_card&.real? ? "known-rule" : "table-active"
     wrap(true, { class: "closed-rule #{klass}" }, :tr) { yield }
   end
 
@@ -34,6 +34,7 @@ format :html do
     wrap_rule_cell "rule-setting" do
       opts = bridge_link_opts(class: "edit-rule-link")
       opts[:path].delete(:layout)
+      opts["data-modal-class"] = "modal-lg"
       link_to_view :modal_rule, setting_title, opts
     end
   end

data/mod/rules/set/type/set/html_views.rb

@@ -26,7 +26,7 @@ format :html do
   end
 
   def setting_group
-    params[:group]&.to_sym || :common
+    voo&.filter&.to_sym || params[:group]&.to_sym || :common
   end
 
   view :set_label do

data/mod/rules/set/type/set/html_views/nest_rules.rb

@@ -1,5 +1,5 @@
 format :html do
-  view :nest_rules, cache: :never, tags: :unknown_ok, wrap: :slot do
+  view :nest_rules, cache: :never, unknown: true, wrap: :slot do
     output [rules_filter(:field_related_rules, :self),
             quick_edit_rules_list(:field_related)]
   end

data/mod/rules/set/type/set/rules_filter.rb

@@ -24,6 +24,10 @@ format :html do
                "data-minimum-results-for-search": "Infinity")
   end
 
+  def selected_set
+    params[:set]
+  end
+
   def set_select_options set_options
     options =
       if set_options == :related || card.type_id != Card::SetID
@@ -31,7 +35,7 @@ format :html do
       else
         [[card.label, card.name.url_key]]
       end
-    options_for_select(options)
+    options_for_select(options, selected_set)
   end
 
   def related_set_options

data/mod/rules/set/type/set/setting_lists.rb

@@ -37,7 +37,7 @@ format :html do
 
   def field_related_settings
     field_settings = %i[default help]
-    if card.type_id == PointerID
+    if card.collection?
       # FIXME: isn't card always of type set???
       # FIXME: should be done with override in pointer set module
       field_settings += %i[input options options_label]

data/mod/rules/spec/set/type/set/html_views_spec.rb

@@ -14,7 +14,7 @@ RSpec.describe Card::Set::Type::Set::HtmlViews do
       with_tag "table" do
         with_tag "tr", with: { id: "Xread-Xright-Xcreate-rule_row-view" } do
           with_tag "td", "create"
-          with_tag "td", "Administrator"
+          with_tag "td", "Shark"
         end
       end
     end

data/mod/rules/spec/set/type/set_spec.rb

@@ -41,7 +41,7 @@ RSpec.describe Card::Set::Type::Set do
       Card::Auth.as_bot do
         Card.create! name: "test_another_card+*right+*structure",
                      type_id: Card::SearchTypeID,
-                     content: ' {"type":"basic","left":"_1"}'
+                     content: ' {"type":"RichText","left":"_1"}'
       end
     end
 

data/mod/search/lib/card/filter_query.rb

@@ -71,11 +71,5 @@ class Card
       return unless name.present?
       @filter_wql[:name] = ["match", name]
     end
-
-    # FIXME: move to wikirate
-    def project_wql project
-      return unless project.present?
-      @filter_wql[:referred_to_by] << { left: { name: project } }
-    end
   end
 end

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

@@ -13,9 +13,8 @@ end
 # #filter_hash is the _value_ of the hash with :filter as the key.
 def filter_hash
   @filter_hash ||= begin
-    filter = Env.params[:filter]
-    filter = filter.to_unsafe_h if filter&.respond_to?(:to_unsafe_h)
-    filter.is_a?(Hash) ? filter : {}
+    filter = Env.params[:filter] || default_filter_hash
+    filter.try(:to_unsafe_h) || filter.clone
   end
 end
 
@@ -29,15 +28,14 @@ def safe_sql_param key
 end
 
 def filter_keys_with_values
-  (filter_keys + advanced_filter_keys).map do |key|
+  filter_keys.map do |key|
     values = filter_param(key)
-    next unless values.present?
-
-    [key, values]
+    values.present? ? [key, values] : next
   end.compact
 end
 
-def default_filter_option
+# initial values for filtered search
+def default_filter_hash
   {}
 end
 

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

@@ -1,51 +1,9 @@
-include_set Abstract::FilterFormHelper
 include_set Abstract::Utility
 
 def filter_class
   Card::FilterQuery
 end
 
-def filter_and_sort_wql
-  sort? ? filter_wql.merge(sort_wql) : filter_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? ? sort_hash : {}
-end
-
-def sort?
-  true
-end
-
-def current_sort
-  sort_param || default_sort_option
-end
-
-def blocked_id_wql
-  not_ids = filter_param :not_ids
-  not_ids.present? ? { id: ["not in", not_ids.split(",")] } : {}
-end
-
-def advanced_filter_keys
-  []
-end
-
-# all filter keys in the order they were selected
-def all_filter_keys
-  @all_filter_keys ||= filter_keys_from_params | filter_keys | advanced_filter_keys
-end
-
 def filter_keys
   [:name]
 end
@@ -55,72 +13,9 @@ def filter_keys_from_params
 end
 
 format :html do
-  delegate :filter_hash, to: :card
-
-  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: show_filter_field?(cat) }
-    end
-  end
-
-  def show_filter_field? field
-    filter_hash.present? ? filter_hash[field] : card.default_filter_option[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.capitalize }
-  end
-
-  def filter_action_path
-    path
-  end
-
-  view :filter_form, cache: :never do
-    filter_fields slot_selector: "._filter-result-slot",
-                  sort_field: _render(:sort_formgroup)
-  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 sort_options
-    {
-      "Alphabetical": :name,
-      "Recently Updated": :updated_at
-    }
+    { "Alphabetical": :name, "Recently Added": :create }
   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
-
-def default_sort_option
-  wql_from_content[:sort]
+  view :filtered_content, template: :haml, wrap: :slot
 end