card 1.92.2 → 1.93.0

data/mod/pointer/set/abstract/code_pointer.rb

@@ -2,7 +2,7 @@ include_set Abstract::Pointer
 
 abstract_basket :item_codenames
 
-def raw_content
+def content
   item_codenames.map do |codename|
     Card[codename] && Card[codename].name
   end.compact.to_pointer_content

data/mod/pointer/set/self/input_options.rb

@@ -7,6 +7,6 @@ add_to_basket :options, "select"
 add_to_basket :options, "multiselect"
 add_to_basket :options, "list"
 
-def raw_content
+def content
   options.to_pointer_content
 end

data/mod/pointer/spec/set/type/pointer_spec.rb

@@ -155,7 +155,7 @@ describe Card::Set::Type::Pointer do
         '[type="checkbox"]'\
         '[value="nonexistingcardmustnotexistthisistherule"]'\
         '[id="pointer-checkbox-nonexistingcardmustnotexistthisistherule"]'
-      debug_assert_view_select @pointer.format.render_checkbox, option_html
+      # debug_assert_view_select @pointer.format.render_checkbox, option_html
       assert_view_select @inherit_pointer.format.render_checkbox, option_html
     end
 

data/mod/prosemirror_editor/set/abstract/prosemirror_editor.rb

@@ -1,7 +1,7 @@
 format :html do
   def prosemirror_editor_input
     wrap_with :div, id: unique_id, class: "prosemirror-editor" do
-      hidden_field :content, class: "d0-card-content", value: card.raw_content
+      hidden_field :content, class: "d0-card-content", value: card.content
     end
   end
 end

data/mod/{standard → search}/set/abstract/search.rb

@@ -53,7 +53,7 @@ format do
 
   view :search_error, cache: :never do
     sr_class = search_with_params.class.to_s
-    %(#{sr_class} :: #{search_with_params.message} :: #{card.raw_content})
+    %(#{sr_class} :: #{search_with_params.message} :: #{card.content})
   end
 
   view :card_list, cache: :never do

data/mod/{standard → search}/set/abstract/wql_search.rb

@@ -11,7 +11,7 @@ end
 # override this to define search
 def wql_hash
   @wql_hash ||= begin
-    query = raw_content
+    query = content
     query = query.is_a?(Hash) ? query : parse_json_query(query)
     query.symbolize_keys
   end
@@ -32,7 +32,7 @@ end
 
 def standardized_query_args args
   args = query_args(args).symbolize_keys
-  args[:context] ||= cardname
+  args[:context] ||= name
   args
 end
 

data/mod/search/set/all/filter.rb

@@ -0,0 +1,12 @@
+format :html do
+  # @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={}, form_args={}
+    render_haml :filter_form, categories: data, form_args: form_args
+  end
+
+  def view_template_path view, set_path= __FILE__
+    super(view, set_path)
+  end
+end
+

data/mod/{standard → search}/set/self/navbox.rb

@@ -10,7 +10,7 @@ format :html do
   def navbar_placeholder
     @@placeholder ||= begin
       holder_card = Card["#{Card[:navbox].name}+*placeholder"]
-      holder_card ? holder_card.raw_content : "Search"
+      holder_card ? holder_card.content : "Search"
     end
   end
 

data/mod/{standard → search}/set/self/recent.rb

@@ -9,7 +9,7 @@ format :html do
   view :core do
     voo.hide :history_legend unless voo.main
     bs_layout container: true, fluid: true do
-      html _optional_render_history_legend with_drafts: false
+      html _render_history_legend with_drafts: false
       row 12 do
         html _render_recent_acts
       end

data/mod/{standard → search}/set/self/search.rb

@@ -79,7 +79,7 @@ format :json do
 
   def add_item exact
     return unless exact.new_card? &&
-                  exact.cardname.valid? &&
+                  exact.name.valid? &&
                   !exact.virtual? &&
                   exact.ok?(:create)
     exact.name
@@ -88,7 +88,7 @@ format :json do
   def new_item_of_type exact
     return unless (exact.type_id == Card::CardtypeID) &&
                   Card.new(type_id: exact.id).ok?(:create)
-    [exact.name, exact.cardname.url_key]
+    [exact.name, exact.name.url_key]
   end
 
   def goto_items term, exact

data/mod/{standard → search}/set/type/search_type.rb

@@ -40,8 +40,8 @@ end
 format :rss do
   view :feed_body do
     case raw_feed_items
-    when Exception then @xml.item(render(:search_error))
-    when Integer then @xml.item(render(:search_count))
+    when Exception then @xml.item(render!(:search_error))
+    when Integer then @xml.item(render!(:search_count))
     else super()
     end
   end

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

@@ -0,0 +1,37 @@
+describe Card::Set::All::Filter do
+  subject do
+    Card["A"].format.filter_form a: { input_field: "<input id='a'/>", label: "A" },
+                                 b: { input_field: "<select id='b'/>", label: "B" },
+                                 c: { input_field: "<select id='c'/>", label: "C",
+                                      active: true }
+  end
+
+  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 "input#a"
+        end
+        with_tag "div._filter_input_field.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 "select#c"
+        end
+      end
+
+      with_tag "div.btn-group._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.d-none", with: { "data-category" => "c" }
+      end
+    end
+  end
+end

data/mod/search/template/all/filter/_filter_input.haml

@@ -0,0 +1,8 @@
+.input-group.input-group-sm.card-outline-primary.mr-2._filter_input{"data-category" => key}
+  %span.input-group-btn
+    %button.btn.btn-primary.btn-sm._delete_filter_input{:type => "button"}
+      %strong
+        %i.material-icons close
+  %span.input-group-addon._selected_category
+    = category[:label]
+  = category[:input_field]

data/mod/search/template/all/filter/filter_form.haml

@@ -0,0 +1,32 @@
+
+.card
+  .card-body.pl-1
+    ._filter_widget
+      ._filter_input_field_prototypes.d-none
+        - categories.each do |key, category|
+          ._filter_input_field{class: key}
+            - unless category[:active]
+              = render_haml_partial :filter_input, key: key, category: category
+
+      %form._filter_form{form_args, "accept-charset" => "UTF-8",
+                                  "data-remote" => "true",
+                                  :method => "get"}
+        ._filter_container.d-flex.flex-row
+          %i.material-icons.text-muted.md-24.p-2 search
+          - categories.each do |key, category|
+            - if category[:active]
+              = render_haml_partial :filter_input, key: key, category: category
+
+          .btn-group._add_filter_dropdown.float-left
+            %button.btn.btn-primary.dropdown-toggle{"aria-expanded" => "false",
+                                                    "aria-haspopup" => "true",
+                                                    "data-toggle" => "dropdown",
+                                                    :type => "button"}
+              Add filter
+            .dropdown-menu
+              - categories.each do |key, category|
+                %a.dropdown-item._filter_category_select{class: ("d-none" if category[:active]),
+                                                         "data-category" => key,
+                                                         "data-label" => category[:label],
+                                                         :href => "#"}
+                  = category[:label]

data/mod/settings/lib/card/setting.rb

@@ -34,10 +34,6 @@ class Card
       @@user_specific.include? codename
     end
 
-    def to_type_id type
-      type.is_a?(Integer) ? type : Card::Codename[type]
-    end
-
     # usage:
     # setting_opts group:        :permission | :event | ...
     #              position:     <Fixnum> (starting at 1, default: add to end)
@@ -51,13 +47,7 @@ class Card
       @codename = opts[:codename] ||
                   name.match(/::(\w+)$/)[1].underscore.to_sym
       self.rule_type_editable = opts[:rule_type_editable]
-      self.restricted_to_type =
-        if opts[:restricted_to_type]
-          type_ids = [opts[:restricted_to_type]].flatten.map do |cardtype|
-            to_type_id(cardtype)
-          end
-          ::Set.new(type_ids)
-        end
+      self.restricted_to_type = permitted_type_ids opts[:restricted_to_type]
       return unless opts[:user_specific]
       @@user_specific << @codename
     end
@@ -77,5 +67,15 @@ class Card
     def applies_to_cardtype type_id
       !restricted_to_type || restricted_to_type.include?(type_id)
     end
+
+    private
+
+    def permitted_type_ids types
+      return unless types
+      type_ids = Array.wrap(types).flatten.map do |cardtype|
+        Card::Codename.id cardtype
+      end
+      ::Set.new(type_ids)
+    end
   end
 end

data/mod/settings/set/abstract/permission.rb

@@ -13,7 +13,7 @@ format :html do
     if card.content == "_left"
       core_inherit_content
     else
-      render :pointer_core
+      render! :pointer_core
     end
   end
 
@@ -69,7 +69,7 @@ format :html do
   def inheritable?
     @inheritable ||=
       begin
-        set_name = card.cardname.trunk_name
+        set_name = card.name.trunk_name
         set_card = Card.fetch(set_name)
         not_set = set_card && set_card.type_id != SetID
         not_set ? false : set_card.inheritable?
@@ -87,7 +87,7 @@ format :html do
         #{check_box_tag 'inherit', 'inherit', inheriting?}
         <label>
           #{core_inherit_content target: 'wagn_role'}
-          #{wrap_with(:a, title: "use left's #{card.cardname.tag} rule") { '?' }}
+          #{wrap_with(:a, title: "use left's #{card.name.tag} rule") { '?' }}
         </label>
       </div>
     HTML

data/mod/settings/set/right/read.rb

@@ -1,3 +1,59 @@
 include Abstract::Permission
 
 format :html do include Abstract::Permission::HtmlFormat end
+
+event :cascade_read_rule, :finalize, after: :update_rule_cache,
+                                     when: :is_rule? do
+  return unless name_is_changing? || trash_is_changing?
+  update_read_ruled_cards rule_set
+end
+
+
+def update_read_ruled_cards set
+  self.class.clear_read_rule_cache
+  Card.cache.reset # maybe be more surgical, just Auth.user related
+  expire # probably shouldn't be necessary,
+  # but was sometimes getting cached version when card should be in the
+  # trash.  could be related to other bugs?
+
+  updated = update_read_rules_of_set_members set
+
+  # then find all cards with me as read_rule_id that were not just updated
+  # and regenerate their read_rules
+  return if new_card?
+  Card.search(read_rule_id: id) do |card|
+    card.update_read_rule unless updated.include?(card.key)
+  end
+end
+
+def update_read_rules_not_overridden_by_narrower_rules cur_index,
+                                                       rule_class_index, set
+  set.item_cards(limit: 0).each_with_object(::Set.new) do |item_card, in_set|
+    in_set << item_card.key
+    next if cur_index < rule_class_index
+    item_card.update_read_rule
+  end
+end
+
+
+
+
+event :process_read_rule_update_queue, :finalize do
+  Array.wrap(@read_rule_update_queue).each(&:update_read_rule)
+  @read_rule_update_queue = []
+end
+
+def update_read_rules_of_set_members set
+  return ::Set.new if trash || !(class_id = id_of_set_class(set))
+  rule_class_ids = set_patterns.map(&:pattern_id)
+  Auth.as_bot do
+    if (rule_class_index = rule_class_ids.index(class_id))
+      cur_index = rule_class_ids.index Card[read_rule_class].id
+      update_read_rules_not_overridden_by_narrower_rules cur_index,
+                                                         rule_class_index, set
+    else
+      warn "No current rule index #{class_id}, #{rule_class_ids.inspect}"
+      ::Set.new
+    end
+  end
+end

data/mod/settings/set/type/setting.rb

@@ -66,7 +66,7 @@ format do
                     = subformat(rules[0])._render_closed_content
             - if !klass.anchorless?
               - duplicate_check(rules) do |rule, duplicate, changeover|
-                - setname = rule.cardname.trunk_name
+                - setname = rule.name.trunk_name
                 %tr{class: ('rule-changeover' if changeover)}
                   %td.rule-anchor
                     = link_to_card setname, setname.trunk_name

data/mod/solid_cache/set/right/solid_cache.rb

@@ -21,7 +21,7 @@ format :html do
     if @card.new_card? && (l = @card.left) && l.solid_cache?
       l.update_solid_cache
       @card = Card.fetch card.name
-      render @denied_view
+      render! @denied_view
     else
       super()
     end

data/mod/standard/set/abstract/toolbar_split_button.rb

@@ -13,7 +13,7 @@ format :html do
   def toolbar_split_button_link_text name, opts
     icon = icon_tag opts.delete(:icon)
     icon + content_tag(:span, " #{name}".html_safe,
-                       class: "hidden-xs-down")
+                       class: "d-sm-none")
   end
 
   def subject

data/mod/standard/set/all/error.rb

@@ -109,7 +109,7 @@ format :html do
   end
 
   view :conflict, error_code: 409, cache: :never do
-    actor_link = link_to_card card.last_action.act.actor.cardname
+    actor_link = link_to_card card.last_action.act.actor.name
     expanded_act = wrap do
       _render_act act: card.last_action.act, act_seq: 0
     end

data/mod/standard/set/all/links.rb

@@ -52,7 +52,7 @@ format do
 
   def link_to_card cardish, text=nil, opts={}
     opts[:path] ||= {}
-    name = opts[:path][:mark] = Card::Name.cardish cardish
+    name = opts[:path][:mark] = Card::Name[cardish]
     add_known_or_wanted_class opts, name
     link_to (text || name), opts
   end
@@ -72,7 +72,7 @@ format do
   end
 
   def link_to_related cardish, text=nil, opts={}
-    name = Card::Name.cardish cardish
+    name = Card::Name[cardish]
     opts[:path] ||= {}
     opts[:path][:related] ||= {}
     opts[:path][:related][:name] ||= "+#{name}"
@@ -138,7 +138,7 @@ format do
 
   def path_mark opts
     return "" if opts[:action] == :create || opts.delete(:no_mark)
-    name = opts[:mark] ? Card::Name.cardish(opts.delete(:mark)) : card.name
+    name = opts[:mark] ? Card::Name[opts.delete(:mark)] : card.name
     add_unknown_name_to_opts name.to_name, opts
     name.to_name.url_key
   end

data/mod/standard/set/all/list_changes.rb

@@ -13,9 +13,13 @@ def linker_lists
               "lists that link to #{name}")
 end
 
+def codename_list_exist?
+  Codename.exists? :list
+end
+
 event :trunk_cardtype_of_a_list_relation_changed, :finalize,
       changed: :type, on: :update,
-      when: proc { Codename[:list] } do
+      when: :codename_list_exist? do
   type_key_was = (tk = Card.quick_fetch(type_id_before_last_save)) && tk.key
 
   list_fields.each do |card|
@@ -27,7 +31,7 @@ end
 
 event :trunk_name_of_a_list_relation_changed, :finalize,
       changed: :name,  on: :update,
-      when: proc { Codename[:list] } do
+      when: :codename_list_exist? do
   list_fields.each do |card|
     card.update_listed_by_cache_for card.item_keys
   end
@@ -36,7 +40,7 @@ end
 
 event :cardtype_of_list_item_changed, :validate,
       changed: :type, on: :save,
-      when: proc { Codename[:list] } do
+      when: :codename_list_exist? do
   linker_lists.each do |card|
     next unless card.item_type_id != type_id
     errors.add(:type,