card 1.98.0 → 1.99.1

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

@@ -4,29 +4,25 @@ format :html do
   end
 
   view :core, cache: :never do
-    table_rules_filter + _render_rules_table
+    filtered_rule_list :bar_rule_list
   end
 
-  view :rules_table, cache: :never do
-    rules_table setting_list(setting_group)
+  view :nest_rules, cache: :never, unknown: true, wrap: :slot do
+    filtered_rule_list :quick_edit_rule_list, :field_related_rules, :related, mark: ""
   end
 
-  def table_rules_filter
-    form_tag path(view: :rules_table, slot: { show: :content }),
-             remote: true, method: "get", role: "filter",
-             "data-slot-selector": ".card-slot.rules-table",
-             class: classy("nodblclick slotter form-inline slim-select2 m-2") do
-      output [
-        label_tag(:view, icon_tag("filter_list"), class: "mr-2"),
-        setting_select,
-        content_tag(:span, "rules that apply to #{_render_set_label}".html_safe,
-                    class: "mx-2 small")
-      ]
-    end
+  view :modal_nest_rules, cache: :never, unknown: true,
+                          wrap: { modal: { title: "Rules for nest" } } do
+    filtered_rule_list :quick_edit_rule_list, :field_related_rules, :self
+  end
+
+  view :bridge_rules_tab, cache: :never do
+    filtered_rule_list :pill_rule_list, :common, :related, mark: ""
   end
 
-  def setting_group
-    voo&.filter&.to_sym || params[:group]&.to_sym || :common
+  def filtered_rule_list view, *filter_args
+    [rules_filter(view, *filter_args),
+     render(view)]
   end
 
   view :set_label do
@@ -41,29 +37,15 @@ format :html do
     end
   end
 
-  def rules_table settings
-    class_up "card-slot", "rules-table"
-    wrap do
-      haml :rules_table, settings: settings,
-                         item_view: voo.show?(:content) ? :closed_rule : :rule_link
-    end
-  end
-
-  def rule_table_row setting
-    return "" unless show_view? setting
-
-    rule_card = card.fetch trait: setting, new: {}
-    row_view, optional_content =
-      voo.hide?(:content) ? %i[rule_link hide] : %i[rule_row show]
-
-    nest(rule_card, view: row_view, optional_content => :content).html_safe
+  def setting_group default=:common
+    voo&.filter&.to_sym || params[:group]&.to_sym || default
   end
 
-  view :editor do
+  view :input do
     "Cannot currently edit Sets" # LOCALIZE
   end
 
-  view :closed_content do
+  view :one_line_content, wrap: {} do
     ""
   end
 end

data/mod/rules/set/type/set/html_views/group_panel.haml

@@ -11,4 +11,4 @@
                           role: "tabpanel",
                           "aria-labelledby": heading_id }
   .card-body
-    = rules_table card.visible_settings(group_key).map(&:codename)
+    = bar_rule_list card.visible_settings(group_key).map(&:codename)

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

@@ -0,0 +1,42 @@
+format :html do
+  view :quick_edit_rule_list, cache: :never, wrap: { slot: { class: "rule-list" } } do
+    quick_edit_rule_list setting_list_from_params(:field_related)
+  end
+
+  view :bar_rule_list, cache: :never, wrap: { slot: { class: "rule-list" } } do
+    bar_rule_list setting_list_from_params
+  end
+
+  view :pill_rule_list, cache: :never, wrap: { slot: { class: "rule-list" } } do
+    pill_rule_list setting_list_from_params
+  end
+
+  def quick_edit_rule_list settings
+    list_tag class: "nav nav-pills flex-column bridge-pills" do
+      settings.map { |setting| rule_list_item setting, :quick_edit }
+    end
+  end
+
+  def pill_rule_list settings
+    list_items =
+      settings.map { |setting| rule_list_item setting, :rule_bridge_link }
+    bridge_pills list_items
+  end
+
+  def bar_rule_list settings
+    list_items =
+      settings.map { |setting| rule_list_item setting, :bar, hide: :full_name }
+    list_items.join("\n").html_safe
+  end
+
+  def rule_list_item setting, view, opts={}
+    return "" unless show_view? setting
+
+    rule_card = card.fetch trait: setting, new: {}
+    nest(rule_card, opts.merge(view: view)).html_safe
+  end
+
+  def setting_list_from_params default=:common
+    setting_list setting_group(default)
+  end
+end

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

@@ -7,37 +7,6 @@ format :html do
   end
 
   def link_to_template_editor
-    link_to_view :template_editor, voo.title, path: { slot: { title: voo.title } }
-  end
-
-  # TODO: hamlize
-  view :template_editor do
-    wrap { haml :template_editor }
-  end
-
-  def frame_header
-    voo.show?(:template_closer) ? template_frame_header : super
-  end
-
-  def template_frame_header
-    [render_template_closer, _render_header]
-  end
-
-  # no slot, because frame is inside template_editor's slot
-  def standard_frame slot=true
-    voo.show?(:template_closer) ? super(false) : super
-  end
-
-  view :template_editor_frame do
-    voo.title = card.label
-    frame do
-      _render_core
-    end
-  end
-
-  view :template_closer do
-    wrap_with "div", class: "card-menu template-closer" do
-      link_to_view :template_link, icon_tag("remove")
-    end
+    link_to_view :modal_nest_rules, voo.title
   end
 end

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

@@ -1,27 +1,41 @@
 format :html do
-  def rules_filter selected_setting=:common, set_options=:related
-    form_tag path(mark: "", view: :rules_list, slot: { hide: :content }),
+  def rules_filter view, selected_setting=nil, set_options=nil, path_opts={}
+    form_tag path(path_opts.merge(view: view)),
              remote: true, method: "get", role: "filter",
-             "data-slot-selector": ".card-slot.rules_list-view",
+             "data-slot-selector": ".card-slot.rule-list",
              class: classy("nodblclick slotter form-inline slim-select2 m-2") do
       output [
         label_tag(:view, icon_tag("filter_list"), class: "mr-2"),
         setting_select(selected_setting),
-        content_tag(:span, "rules that apply to set ...", class: "mx-2 small"),
         set_select(set_options)
-      ]
+      ].flatten
     end
   end
 
+  def set_select set_options
+    return filter_text.html_safe unless set_options
+
+    [content_tag(:span, "rules that apply to set ...", class: "mx-2 small"),
+     set_select_tag(set_options)]
+  end
+
   def setting_select selected=nil
     select_tag(:group, grouped_options_for_select(setting_options, selected),
-               class: "_submit-on-select form-control")
+               class: "_submit-on-select form-control",
+               "data-select2-id": "#{unique_id}-#{Time.now.to_i}")
   end
 
-  def set_select set_options=:related
+  def filter_text
+    wrap_with :span, class: "mx-2 small" do
+      "rules that apply to #{_render_set_label.downcase}" # LOCALIZE
+    end
+  end
+
+  def set_select_tag set_options=:related
     select_tag(:mark, set_select_options(set_options),
-               class: "_submit-on-select form-control",
-               "data-minimum-results-for-search": "Infinity")
+               class: "_submit-on-select form-control _close-rule-overlay-on-select",
+               "data-minimum-results-for-search": "Infinity",
+               "data-select2-id": "#{unique_id}-#{Time.now.to_i}")
   end
 
   def selected_set
@@ -30,7 +44,7 @@ format :html do
 
   def set_select_options set_options
     options =
-      if set_options == :related || card.type_id != Card::SetID
+      if set_options == :related
         related_set_options
       else
         [[card.label, card.name.url_key]]

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

@@ -4,7 +4,7 @@ format :html do
                      ["Field", :field_related_rules],
                      ["Recent", :recent_rules]].freeze
 
-  COMMON_SETTINGS = %i[create read update delete structure default].freeze
+  COMMON_SETTINGS = %i[create read update delete structure default guide].freeze
   FIELD_SETTINGS = %i[default help].freeze
 
   def setting_options
@@ -13,6 +13,10 @@ format :html do
      ["Single rules", card.visible_setting_codenames]]
   end
 
+  def field_settings
+    %i[default help input_type content_options content_option_view]
+  end
+
   # @param val setting category, setting group or single setting
   def setting_list val
     category_setting_list(val) || group_setting_list(val) || [val]
@@ -32,17 +36,18 @@ format :html do
       card.visible_setting_codenames & COMMON_SETTINGS
     when :field_related, :field_related_rules
       field_related_settings
+    when :nest_editor_field_related
+      nest_editor_field_related_settings
     end
   end
 
+  def nest_editor_field_related_settings
+    field_settings
+    #  & card.visible_settings(nil, card.prototype_default_type_id).map(&:codename)
+  end
+
   def field_related_settings
-    field_settings = %i[default help]
-    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]
-    end
-    card.visible_setting_codenames & field_settings
+    field_settings # card.visible_setting_codenames &
   end
 
   def recent_settings
@@ -51,33 +56,21 @@ format :html do
   end
 
   view :all_rules_list do
-    rules_list :all, card.visible_setting_codenames.sort
-  end
-
-  view :grouped_rules_list do
-    with_label_and_navbars :grouped_rules do
-      wrap_with :div, class: "panel-group", id: "accordion",
-                      role: "tablist", "aria-multiselectable": "true" do
-        Card::Setting.groups.keys.map do |group_key|
-          _render group_key
-        end
-      end
-    end
+    pill_rule_list card.visible_setting_codenames.sort
   end
 
   view :recent_rules_list do
     recent_settings = Card[:recent_settings].item_cards.map(&:codename)
     settings = recent_settings.map(&:to_sym) & card.visible_setting_codenames
-    rules_list :all, settings
+    pill_rule_list settings
   end
 
   view :common_rules_list do
-    settings = card.visible_setting_codenames & COMMON_SETTINGS
-    # "&" = set intersection
-    rules_list :common, settings
+    settings = card.visible_setting_codenames & COMMON_SETTINGS # "&" = set intersection
+    pill_rule_list settings
   end
 
   view :field_related_rules_list do
-    rules_list :field_related, field_related_settings
+    pill_rule_list field_related_settings
   end
 end

data/mod/rules/spec/set/rule/bar_view_spec.rb

@@ -0,0 +1,15 @@
+# -*- encoding : utf-8 -*-
+
+RSpec.describe Card::Set::Rule::BarView do
+  def card_subject
+    Card.fetch("*read+*right+*input type", new: {})
+  end
+
+  check_html_views_for_errors
+
+  it "renders setting view for a *input type rule", as_bot: true do
+    expect_view("rule_edit").to have_tag "div.modal" do
+      with_tag "div.rule-section", count: 2
+    end
+  end
+end

data/mod/rules/spec/set/rule/editor_spec.rb

@@ -2,8 +2,22 @@
 
 RSpec.describe Card::Set::Rule::Editor do
   def card_subject
-    Card.fetch("*read+*right+*input", new: {})
+    Card.fetch("*read+*right+*input type", new: {})
   end
 
   check_html_views_for_errors
+
+  describe "#left_type_for_nest_editor_set_selection" do
+    def type_for_set_structure set_name
+      Card.fetch("#{set_name}+*structure").format.left_type_for_nest_editor_set_selection
+    end
+
+    it "finds anchor name for type structure rules" do
+      expect(type_for_set_structure("Role+*type")).to eq("Role")
+    end
+
+    it "finds anchor type for self structure rules" do
+      expect(type_for_set_structure("Sign up+*self")).to eq("Cardtype")
+    end
+  end
 end

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

@@ -6,17 +6,4 @@ RSpec.describe Card::Set::Type::Set::HtmlViews do
   end
 
   check_html_views_for_errors
-
-  it "renders setting table for a right set" do
-    expect_view("open", card: "*read+*right")
-      .to have_tag "div", with: { id: "Xread-Xright-open-view" } do
-      with_tag "form", with: { role: "filter" }
-      with_tag "table" do
-        with_tag "tr", with: { id: "Xread-Xright-Xcreate-rule_row-view" } do
-          with_tag "td", "create"
-          with_tag "td", "Shark"
-        end
-      end
-    end
-  end
 end

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

@@ -0,0 +1,17 @@
+# -*- encoding : utf-8 -*-
+
+RSpec.describe Card::Set::Type::Set::SettingLists do
+  def card_subject
+    Card.fetch("User+*type")
+  end
+
+  specify "#nest_editor_field_related_settings", as_bot: true do
+    create ["characters", :right, :input_type], content: "select"
+    create ["characters", :right, :default], type_id: Card::ListID
+    card = Card.new name: "RichText+characters+*type plus right"
+    expect(card.format(:html).nest_editor_field_related_settings)
+      .to eq %i[default help input_type content_options content_option_view]
+  end
+
+  check_html_views_for_errors
+end

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

@@ -55,14 +55,9 @@ RSpec.describe Card::Set::Type::Set do
 
     it "produces template editor with close link within large brackets" do
       set_card = nested_card.fetch trait: :right
-      expect(set_card.format.render(:template_editor)).to have_tag("div.card-slot") do
-        with_tag "div.template-editor-left", text: "{{"
-        with_tag "div.template-editor-main" do
-          with_tag "div.template-closer"
-          with_tag "div.card-header"
-          with_tag "div.card-body"
-        end
-        with_tag "div.template-editor-right", text: "}}"
+      expect(set_card.format.render(:template_link)).to have_tag("div.card-slot") do
+        with_text(/^\{\{.+\}\}$/)
+        with_tag "a", "modal_nest_rules"
       end
     end
   end

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

@@ -16,8 +16,9 @@ format :html do
     multiselect_filter_tag field, default, options
   end
 
-  def text_filter field, opts={}
-    text_filter_with_name_and_value filter_name(field), filter_param(field), opts
+  def text_filter field, default=nil, opts={}
+    value = filter_param(field) || default
+    text_filter_with_name_and_value filter_name(field), value, opts
   end
 
   def text_filter_with_name_and_value name, value, opts
@@ -26,12 +27,13 @@ format :html do
     text_field_tag name, value, opts
   end
 
-  def range_filter field, opts={}
+  def range_filter field, default={}, opts={}
     add_class opts, "simple-text range-filter-subfield"
+    default ||= {}
     output [range_sign(:from),
-            sub_text_filter(field, :from, opts),
+            sub_text_filter(field, :from, default, opts),
             range_sign(:to),
-            sub_text_filter(field, :to, opts)]
+            sub_text_filter(field, :to, default, opts)]
   end
 
   def range_sign side
@@ -41,9 +43,9 @@ format :html do
     end
   end
 
-  def sub_text_filter field, subfield, opts={}
+  def sub_text_filter field, subfield, default={}, opts={}
     name = "filter[#{field}][#{subfield}]"
-    value = filter_hash.dig field, subfield
+    value = filter_hash.dig(field, subfield) || default[subfield]
     text_filter_with_name_and_value name, value, opts
   end
 
@@ -55,8 +57,8 @@ format :html do
 
   def autocomplete_filter type_code, options_card=nil
     options_card ||= Card::Name[type_code, :type, :by_name]
-    text_filter type_code, class: "#{type_code}_autocomplete",
-                           "data-options-card": options_card
+    text_filter type_code, "", class: "#{type_code}_autocomplete",
+                               "data-options-card": options_card
   end
 
   def multiselect_filter_type_based type_codename