card 1.96.8 → 1.97.0

data/mod/edit/set/all/form_buttons.rb

@@ -0,0 +1,52 @@
+format :html do
+  def standard_submit_button
+    output [standard_save_button, standard_save_and_close_button]
+  end
+
+  def standard_save_button opts={}
+    return if voo&.hide?(:save_button)
+    add_class opts, "submit-button btn-sm mr-3"
+    opts[:text] ||= "Save"
+    opts["data-cy"] = "save"
+    submit_button opts
+  end
+
+  # @param close: [:modal, :overlay]
+  #
+  def standard_save_and_close_button opts={}
+    close = opts.delete(:close) || :modal
+    add_class opts, "submit-button btn-sm mr-3 _close-#{close}-on-success _update-origin"
+    opts.reverse_merge! text: "Save and Close", "data-cy": "submit-#{close}"
+
+    submit_button opts
+  end
+
+  def standard_cancel_button args={}
+    args.reverse_merge! class: "cancel-button ml-4", href: path, "data-cy": "cancel"
+    cancel_button args
+  end
+
+  def edit_cancel_button
+    modal_close_button "Cancel", situation: "secondary", class: "btn-sm"
+  end
+
+  def delete_button opts={}
+    link_to "Delete", delete_button_opts(opts)
+  end
+
+  def delete_button_opts opts={}
+    add_class opts,  "slotter btn btn-outline-danger ml-auto btn-sm"
+    opts["data-confirm"] = delete_confirm opts
+    opts[:path] = { action: :delete, success: delete_success(opts) }
+    opts[:remote] = true
+    opts
+  end
+
+  def delete_confirm opts
+    opts.delete(:confirm) || "Are you sure you want to delete #{safe_name}?"
+  end
+
+  def delete_success opts
+    opts.delete(:success) || (main? ? "REDIRECT: *previous" : { view: :just_deleted })
+  end
+end

data/mod/{standard/set/all/rich_html → edit/set/all}/form_elements.rb

@@ -1,6 +1,7 @@
 format :html do
   def success_tags opts
     return "" unless opts
+
     hidden_tags success: opts
   end
 
@@ -51,7 +52,7 @@ format :html do
   # redirect to *previous if no :href is given
   def cancel_button args={}
     text = args.delete(:text) || "Cancel"
-    add_class args, "btn btn-#{args.delete(:situation) || 'outline-secondary'}"
+    add_class args, "btn btn-#{args.delete(:situation) || 'secondary'}"
     add_class args, cancel_strategy(args[:redirect], args[:href])
     args[:href] ||= path_to_previous
     args["data-remote"] = true

data/mod/{standard/set/all/rich_html → edit/set/all}/formgroup.rb

@@ -14,7 +14,8 @@ format :html do
   end
 
   def formgroup_label editor_type, title
-    return if voo && voo.hide?(:title)
+    return if voo&.hide?(:title) || title.blank?
+
     label_type = editor_type || :content
     form.label label_type, title
   end
@@ -28,6 +29,7 @@ format :html do
 
   def formgroup_help_text text=nil
     return "" if text == false
+
     class_up "help-text", "help-block"
     voo.help = text if voo && text.to_s != "true"
     _render_help

data/mod/{standard/set/all/rich_html → edit/set/all}/new.rb

@@ -1,5 +1,3 @@
-
-
 format :html do
   view :new, perms: :create, tags: :unknown_ok, cache: :never do
     with_nest_mode :edit do

data/mod/edit/set/all/toolbar.rb

@@ -0,0 +1,8 @@
+format :html do
+  def autosaved_draft_link opts={}
+    text = opts.delete(:text) || "autosaved draft"
+    opts[:path] = { edit_draft: true }
+    add_class opts, "navbar-link"
+    link_to_view :edit, text, opts
+  end
+end

data/mod/edit/spec/set/all/bridge/tab_views_spec.rb

@@ -0,0 +1,14 @@
+# -*- encoding : utf-8 -*-
+
+describe Card::Set::All::Bridge::TabViews do
+  check_views_for_errors :engage_tab, :history_tab, :related_tab, :rules_tab,
+                         :account_tab, :follow_section
+
+  specify "view :related_tab" do
+    expect_view(:related_tab).to have_tag :ul do
+      with_tag "li.nav-item" do
+        with_tag "a.nav-link[href*=children]", "children"
+      end
+    end
+  end
+end

data/mod/{standard/spec/set/all/rich_html/editing_spec.rb → edit/spec/set/all/bridge_spec.rb}

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 
-describe Card::Set::All::RichHtml::Editing do
+RSpec.describe Card::Set::All::Bridge do
   describe "edit_nests view" do
     it "shows editors for both absolute and relative nests" do
       card_subject.content = "{{absolute}} AND {{+relative}}"

data/mod/edit/spec/set/all/editing_spec.rb

@@ -0,0 +1,15 @@
+# -*- encoding : utf-8 -*-
+
+RSpec.describe Card::Set::All::Editing do
+  describe "edit_nests view" do
+    it "shows editors for both absolute and relative nests" do
+      card_subject.content = "{{absolute}} AND {{+relative}}"
+      expect_view(:edit_nests).to have_tag "div.SELF-a" do
+        with_tag "div.card-editor", with: { card_name: "absolute" }
+        with_tag "div.card-editor", with: { card_name: "A+relative" }
+      end
+    end
+  end
+
+  check_html_views_for_errors
+end

data/mod/{standard/spec/set/all/rich_html → edit/spec/set/all}/form_elements_spec.rb

@@ -1,4 +1,4 @@
-RSpec.describe Card::Set::All::RichHtml::FormElements do
+RSpec.describe Card::Set::All::FormElements do
   describe "#hidden_tags" do
     def hidden_tags opts
       Card["A"].format.hidden_tags opts
@@ -10,13 +10,15 @@ RSpec.describe Card::Set::All::RichHtml::FormElements do
     end
 
     example "deep nested arguments" do
-      tags = hidden_tags(a: { b: { c: "val1" },  d: "val2" }, x: { y: "val3" } )
-      expect(tags)
-        .to have_tag(:input, with: { type: "hidden", name: "a[b][c]", value: "val1" })
-      expect(tags)
-        .to have_tag(:input, with: { type: "hidden", name: "a[d]", value: "val2" })
-      expect(tags)
-        .to have_tag(:input, with: { type: "hidden", name: "x[y]", value: "val3" })
+      tags = hidden_tags a: { b: { c: "val1" }, d: "val2" }, x: { y: "val3" }
+      aggregate_failures do
+        expect(tags)
+          .to have_tag(:input, with: { type: "hidden", name: "a[b][c]", value: "val1" })
+        expect(tags)
+          .to have_tag(:input, with: { type: "hidden", name: "a[d]", value: "val2" })
+        expect(tags)
+          .to have_tag(:input, with: { type: "hidden", name: "x[y]", value: "val3" })
+      end
     end
 
     describe "array values" do

data/mod/edit/spec/set/all/form_spec.rb

@@ -0,0 +1,50 @@
+# -*- encoding : utf-8 -*-
+
+RSpec.describe Card::Set::All::Form do
+  describe "type_list" do
+    let(:card) { Card["UserForm"] } # no cards with this type
+
+    it "gets type options from type_field renderer method" do
+      aggregate_failures do
+        expect(card.format.type_field).to match(/<option [^>]*selected/)
+        tf = card.format.type_field(no_current_type: true)
+        expect(tf).not_to match(/<option [^>]*selected/)
+        expect(tf.scan(/<option /).length).to eq(SharedData::CARDTYPE_COUNT)
+        tf = card.format.type_field
+        expect(tf).to match(/<option [^>]*selected/)
+        expect(tf.scan(/<option /).length).to eq(SharedData::CARDTYPE_COUNT)
+      end
+    end
+
+    it "gets type list" do
+      Card::Auth.as :anonymous do
+        tf = card.format.type_field(no_current_type: true)
+        aggregate_failures do
+          expect(tf).not_to match(/<option [^>]*selected/)
+          expect(tf.scan(/<option /).length).to eq(1)
+          tf = card.format.type_field
+          expect(tf).to match(/<option [^>]*selected/)
+          expect(tf.scan(/<option /).length).to eq(2)
+        end
+      end
+    end
+  end
+
+  context "with type and header" do
+    it "renders type without no-edit class when no cards of type" do
+      card = Card["UserForm"]  # no cards with this type
+      aggregate_failures do
+        expect(card.format.render_type)
+          .to match(/<a[^>]* class="([^"]*)?\bcardtype\b[^"]*"/)
+        expect(card.format.render_type)
+          .not_to match(/<a[^>]* class="([^"]*)?\bno-edit\b[^"]*"/)
+      end
+    end
+    it "renders type header with no-edit class when cards of type exist" do
+      no_edit_card = Card["cardtype a"]
+      expect(no_edit_card.format.render_type)
+        .to match(/<a[^>]* class="([^"]*)?\bcardtype\b[^"]*"/)
+        .and match(/<a[^>]* class="([^"]*)?\bno-edit\b[^"]*"/)
+    end
+  end
+end

data/mod/follow/lib/card/follower_stash.rb

@@ -9,6 +9,7 @@ class Card
 
     def check_card card
       return if @checked.include? card.key
+
       Auth.as_bot do
         @checked.add card.key
         stash_direct_followers card
@@ -37,6 +38,7 @@ class Card
 
     def stash_field_followers card
       return unless (fields = follow_fields card)
+
       fields.each do |field|
         break if stash_field_follower card, field
       end
@@ -44,12 +46,14 @@ class Card
 
     def stash_field_follower card, field
       return false unless checked?(field.to_name) || nested?(card, field)
+
       check_card card
       true
     end
 
     def nested? card, field
       return unless field.to_name.key == includes_card_key
+
       @checked.intersection(nestee_set(card)).any?
     end
 
@@ -73,6 +77,7 @@ class Card
 
     def follow_fields card
       return unless card && !checked?(card.name)
+
       card.rule_card(:follow_fields)&.item_names(context: card.name)
     end
 

data/mod/follow/set/abstract/follow_option.rb

@@ -1,4 +1,3 @@
-
 def restrictive_option?
   Card::FollowOption.restrictive_options.include? codename
 end

data/mod/follow/set/all/follow/follow_link.rb

@@ -1,73 +1,61 @@
-format do
-  def show_follow?
-    follower? && !card.new_card? && card.followable?
-  end
+#! no set module
+class FollowLink
+  attr_reader :format, :rule_content, :link_text, :action, :css_class, :hover_text
 
-  def follower?
-    # only User cards can follow until preferences are generalized to all
-    # accounted cards.
-    Auth.signed_in? && Auth.current.type_id == UserID
-  end
+  delegate :link_to, to: :format
 
-  def follow_link_hash
-    toggle = card.followed? ? :off : :on
-    hash = { class: "follow-toggle-#{toggle}" }
-    hash.merge! send("follow_link_#{toggle}_hash")
-    hash[:path] = path mark: follow_link_mark,
-                       action: :update,
-                       success: { layout: :modal, view: :follow_status },
-                       card: { content: "[[#{hash[:content]}]]" }
-    hash
+  def initialize format
+    @format = format
+    @card = format.card
   end
 
-  def follow_link_on_hash
-    { content: "*always",
-      title: follow_link_title("send"),
-      verb: "follow" }
+  def modal_link icon=false
+    opts = link_opts.merge(
+      "data-path": link_opts[:path],
+      "data-toggle": "modal",
+      "data-target": "#modal-#{card.name.safe_key}",
+      class: css_classes("follow-link", link_opts[:class])
+    )
+    link_to render_link_text(icon), opts
   end
 
-  def follow_link_off_hash
-    { content: "*never",
-      title: follow_link_title("stop sending"),
-      verb: "unfollow" }
+  def button
+    opts = link_opts(:follow_section).merge(
+      remote: true,
+      class: @format.css_classes("follow-link", link_opts[:class],
+                                 "slotter btn btn-sm btn-primary")
+    )
+    opts["data-update-foreign-slot"] = ".d0-card-body > .card-slot.RIGHT-Xfollower.content-view"
+    opts["data-hover-text"] = hover_text if hover_text
+    link_to render_link_text, opts
   end
 
-  def follow_link_title action
-    "#{action} emails about changes to #{card.follow_label}"
+  def link_opts success_view=:follow_status
+    { title: title,
+      path: path(success_view),
+      class: css_class }
   end
 
-  def follow_link_mark
-    card.follow_set_card.follow_rule_name Auth.current.name
+  def render_link_text icon=false
+    verb = %(<span class="follow-verb">#{link_text}</span>)
+    icon = icon ? icon_tag(:flag) : ""
+    [icon, verb].compact.join.html_safe
   end
-end
 
-format :json do
-  view :follow_status do
-    follow_link_hash
-  end
-end
+  private
 
-format :html do
-  view :follow_link do
-    follow_link
+  def mark
+    @card.follow_set_card.follow_rule_name Auth.current.name
   end
 
-  def follow_link opts={}, icon=false
-    hash = follow_link_hash
-    link_opts = opts.merge(
-      path: hash[:path],
-      title: hash[:title],
-      "data-path": hash[:path],
-      "data-toggle": "modal",
-      "data-target": "#modal-#{card.name.safe_key}",
-      class: css_classes("follow-link", opts[:class])
-    )
-    link_to follow_link_text(icon, hash[:verb]), link_opts
+  def path view=:follow_status
+    @format.path mark: mark,
+                 action: :update,
+                 success: { id: @card.name, view: view },
+                 card: { content: "[[#{rule_content}]]" }
   end
 
-  def follow_link_text icon, verb
-    verb = %(<span class="follow-verb menu-item-label">#{verb}<span>)
-    icon = icon ? icon_tag(:flag) : ""
-    [icon, verb].compact.join.html_safe
+  def title
+    "#{action} emails about changes to #{@card.follow_label}"
   end
 end

data/mod/follow/set/all/follow/follow_link_views.rb

@@ -0,0 +1,29 @@
+format do
+  def follow_link_class
+    card.followed? ? StopFollowLink : StartFollowLink
+  end
+
+  def show_follow?
+    Auth.signed_in? && !card.new_card? && card.followable?
+  end
+end
+
+format :json do
+  view :follow_status do
+    follow_link_class.link_opts
+  end
+end
+
+format :html do
+  def follow_button
+    follow_link_class.new(self).button
+  end
+
+  def follow_modal_link
+    follow_link_class.new(self).modal_link
+  end
+
+  view :follow_button, cache: :never do
+    follow_button
+  end
+end

data/mod/follow/set/all/follow/followed_by.rb

@@ -17,6 +17,7 @@ end
 # follow changes of field_card
 def followed_field? field_card
   return unless (follow_field_rule = rule_card(:follow_fields))
+
   follow_field_rule.item_names(context: self).find do |item|
     case item.to_name.key
     when field_card.key         then true
@@ -45,6 +46,7 @@ end
 def all_follow_rule_options follower_id
   follow_rule = rule :follow, user_id: follower_id
   return [] unless follow_rule.present?
+
   follow_rule.split("\n")
 end
 
@@ -64,5 +66,6 @@ end
 
 def follower_candidate_ids_for_option option_code
   return [] unless (block = FollowOption.follower_candidate_ids[option_code])
+
   block.call self
 end

data/mod/follow/set/all/follow/follower_ids.rb

@@ -56,6 +56,10 @@ def follower_ids
   end
 end
 
+def followers_count
+  follower_ids.size
+end
+
 def indirect_follower_ids
   result = ::Set.new
   left_card = left
@@ -91,6 +95,7 @@ end
 def direct_follower_ids_for_set set_card, ids
   set_card.all_user_ids_with_rule_for(:follow).each do |user_id|
     next if ids.include?(user_id) || !(option = follow_rule_option user_id)
+
     yield user_id, set_card, option if block_given?
     ids << user_id
   end