card 1.98.3 → 1.99.0

data/mod/core/set/all/rules.rb

@@ -113,12 +113,7 @@ def related_sets with_self=false
   # refers to sets that users may configure from the current card -
   # NOT to sets to which the current card belongs
 
-  # FIXME: change to use codenames!!
-
   sets = []
-  if known? && type_id == Card::CardtypeID # FIXME: belongs in type/cardtype
-    sets << ["#{name}+*type", Card::Set::Type.label(name)]
-  end
   sets << ["#{name}+*self", Card::Set::Self.label(name)] if with_self
   if known? && name.simple?
     sets << ["#{name}+*right", Card::Set::Right.label(name)]

data/mod/core/set_pattern/03_type.rb

@@ -6,6 +6,10 @@ def short_label name
   %(all "#{name}s")
 end
 
+def generic_label
+  "cards of a given type"
+end
+
 def prototype_args anchor
   { type: anchor }
 end

data/mod/core/set_pattern/07_right.rb

@@ -11,6 +11,10 @@ def short_label name
   %(all "+#{name}s")
 end
 
+def generic_label
+  "given field cards"
+end
+
 def prototype_args anchor
   { name: "*dummy+#{anchor}" }
 end

data/mod/core/set_pattern/08_type_plus_right.rb

@@ -16,6 +16,10 @@ def short_label name
   %(all "+#{name.tag}" on "#{name.left}s")
 end
 
+def generic_label
+  "given field cards on a given type"
+end
+
 def prototype_args anchor
   {
     name: "+#{anchor.tag}",

data/mod/core/set_pattern/09_self.rb

@@ -6,6 +6,10 @@ def short_label name
   name
 end
 
+def generic_label
+  "a single card"
+end
+
 def prototype_args anchor
   { name: anchor }
 end

data/mod/core/spec/chunk/link_spec.rb

@@ -62,6 +62,12 @@ RSpec.describe Card::Content::Chunk::Link do
                                 text: "/*recent"
   end
 
+  it "handles names with slashes" do
+    assert_link "[[he/she]]", class: "wanted-card",
+                              href: "/he_she?card%5Bname%5D=he%2Fshe",
+                              text: "he/she"
+  end
+
   it "handles absolute urls" do
     assert_link "[[http://google.com]]",
                 class: "external-link", target: "_blank",

data/mod/core/spec/chunk/nest_spec.rb

@@ -166,11 +166,11 @@ RSpec.describe Card::Content::Chunk::Nest do
       expect { adm.format.render_core }.to raise_error(Card::Error::UserError, /too deep/)
     end
 
-    it "handles missing cards" do
+    it "handles unknown cards" do
       @a = create! "boo", "hey {{+there}}"
       r = @a.format.render_core
       assert_view_select(
-        r, 'div[data-card-name="boo+there"][class~="missing-view"]'
+        r, 'div[data-card-name="boo+there"][class~="unknown-view"]'
       )
     end
 

data/mod/core/spec/set/all/permissions_spec.rb

@@ -86,16 +86,6 @@ RSpec.describe Card::Set::All::Permissions do
       end
     end
 
-    it "is granted to admin if to anybody" do
-      Card::Auth.as_bot do
-        c1 = Card["c1"]
-        Card.create! name: "c1+*self+*comment", type: "Pointer",
-                     content: "[[r1]]"
-        expect(c1.who_can(:comment)).to eq([Card["r1"].id])
-        expect(c1.ok?(:comment)).to be_truthy
-      end
-    end
-
     it "reader setting", aggregate_failures: true do
       Card.where(trash: false).each do |ca|
         rule_id, rule_class = ca.permission_rule_id_and_class :read

data/mod/core/spec/set/all/rules_spec.rb

@@ -14,19 +14,9 @@ describe Card::Set::All::Rules do
 
   describe "#rule" do
     it "retrieves Set based value" do
-      Card.create name: "Book+*type+*add help", content: "authorize"
-      add_help_rule = Card.new(type: "Book").rule(:add_help, fallback: :help)
-      expect(add_help_rule).to eq("authorize")
-    end
-
-    it "retrieves default values" do
-      # Card.create name: 'all Basic cards', type: 'Set',
-      #            content: "{\"type\": \"Basic\'}'
-      # defaults should work when other Sets are present
-      assert Card.create(name: "*all+*add help", content: "lobotomize")
-      # Card.default_rule(:add_help, fallback: :help).should == 'lobotomize'
-      add_help_rule = Card.new(type_id: Card::BasicID).rule(:add_help, fallback: :help)
-      expect(add_help_rule).to eq("lobotomize")
+      Card.create name: "Book+*type+*help", content: "authorize"
+      help_rule = Card.new(type: "Book").rule(:help)
+      expect(help_rule).to eq("authorize")
     end
 
     it "retrieves single values" do
@@ -38,19 +28,19 @@ describe Card::Set::All::Rules do
       before do
         Card.create name: "*all+*help", content: "edit any kind of card"
       end
-      subject { Card.new(type: "Book").rule(:add_help, fallback: :help) }
+      subject { Card.new(type: "Book").rule(:csv_structure, fallback: :help) }
 
       it "retrieves default setting" do
         expect(subject).to eq("edit any kind of card")
       end
 
       it "retrieves primary setting" do
-        Card.create name: "*all+*add help", content: "add any kind of card"
+        Card.create name: "*all+*csv_structure", content: "add any kind of card"
         expect(subject).to eq("add any kind of card")
       end
 
       it "retrieves more specific default setting" do
-        Card.create name: "*all+*add help", content: "add any kind of card"
+        Card.create name: "*all+*csv_structure", content: "add any kind of card"
         Card.create name: "*Book+*type+*help", content: "edit a Book"
         expect(subject).to eq("add any kind of card")
       end

data/mod/date/set/self/datepicker.rb

@@ -0,0 +1,6 @@
+def raw_help_text
+  <<-TEXT
+    Configure the date select tool using these available 
+    [[https://tempusdominus.github.io/bootstrap-4/Options/|options]]
+  TEXT
+end

data/mod/date/set/type/date.rb

@@ -1,5 +1,5 @@
 format :html do
-  def editor
+  def input_type
     :calendar
   end
 end

data/mod/date/spec/set/type/date_spec.rb

@@ -2,6 +2,6 @@
 
 describe Card::Set::Type::Date do
   it "has special editor" do
-    assert_view_select render_editor("Date"), 'input[class~="date-editor"]'
+    assert_view_select render_input("Date"), 'input[class~="date-editor"]'
   end
 end

data/mod/edit/set/all/bridge/account_section.rb

@@ -0,0 +1,16 @@
+format :html do
+  def account_details_items
+    [
+      ["Email and Password", :account,
+       { path: { slot: { hide: %i[help_link bridge_link] } } }],
+      ["Roles", :roles,
+       { path:  { view: :content_with_edit_button } }],
+      ["Notifications", :follow]
+    ]
+  end
+
+  def account_content_items
+    [["Created", :created],
+     ["Edited", :edited]]
+  end
+end

data/mod/edit/set/all/bridge/bridge_pills.rb

@@ -0,0 +1,47 @@
+format :html do
+  BRIDGE_PILL_UL_CLASSES =
+    "nav nav-pills _auto-single-select bridge-pills flex-column".freeze
+
+  BRIDGE_PILL_LI_CLASSES = "nav-item".freeze
+
+  def bridge_pills items
+    list_tag class: BRIDGE_PILL_UL_CLASSES, items: { class: BRIDGE_PILL_LI_CLASSES } do
+      items
+    end
+  end
+
+  def bridge_pill_items data, breadcrumb
+    data.map do |text, field, extra_opts|
+      opts = bridge_pill_item_opts breadcrumb, extra_opts, text
+      mark = opts.delete(:mark) == :absolute ? field : [card, field]
+      link_to_card mark, text, opts
+    end
+  end
+
+  def bridge_pill_item_opts breadcrumb, extra_opts, text
+    opts = bridge_link_opts.merge("data-toggle": "pill")
+    opts.merge! breadcrumb_data(breadcrumb)
+
+    if extra_opts
+      classes = extra_opts.delete :class
+      add_class opts, classes if classes
+      opts.deep_merge! extra_opts
+    end
+    opts["data-cy"] = "#{text.to_name.key}-pill"
+    add_class opts, "nav-link"
+    opts
+  end
+
+  def bridge_pill_sections tab_name
+    wrap_with :ul, class: BRIDGE_PILL_UL_CLASSES do
+      yield.map { |args| bridge_pill_section(tab_name, *args) }
+    end
+  end
+
+  def bridge_pill_section tab_name, title, items
+    wrap_with(:h6, title, class: "ml-1 mt-3") +
+      wrap_each_with(:li, class: BRIDGE_PILL_LI_CLASSES) do
+        bridge_pill_items(items, tab_name)
+      end.html_safe
+  end
+end

data/mod/edit/set/all/bridge/related_section.rb

@@ -0,0 +1,34 @@
+format :html do
+  RELATED_ITEMS =
+    {
+      "by name" => [["children", :children],
+                    ["mates", :mates]],
+      # FIXME: optimize,
+      "by content" => [["links out", :links_to],
+                       ["links in", :linked_to_by],
+                       ["nests", :nests],
+                       ["nested by", :nested_by],
+                       ["references out", :refers_to],
+                       ["references in",  :referred_to_by]]
+      # ["by edit", [["creator", :creator],
+      #              ["editors", :editors],
+      #              ["last edited", :last_edited]]]
+    }.freeze
+
+  def related_by_name_items
+    pills = []
+    if card.name.junction?
+      pills += card.name.ancestors.map { |a| [a, a, { mark: :absolute }] }
+    end
+    pills += RELATED_ITEMS["by name"]
+    pills
+  end
+
+  def related_by_content_items
+    RELATED_ITEMS["by content"]
+  end
+
+  def related_by_type_items
+    [["#{card.type} cards", [card.type, :type, :by_name], mark: :absolute]]
+  end
+end

data/mod/edit/set/all/bridge/tab_views.rb

@@ -1,10 +1,4 @@
 format :html do
-  RELATED_ITEMS = [["children",       :children],
-                   # ["mates",          "bed",          "*mates"],
-                   # FIXME: optimize and restore
-                   ["references out", :refers_to],
-                   ["references in",  :referred_to_by]].freeze
-
   view :engage_tab, wrap: { div: { class: "m-3 mt-4 _engage-tab" } }, cache: :never do
     [render_follow_section, discussion_section].compact
   end
@@ -16,7 +10,11 @@ format :html do
   end
 
   view :related_tab do
-    bridge_pills bridge_pill_items(RELATED_ITEMS, "Related")
+    bridge_pill_sections "Related" do
+      %w[name content type].map do |section_name|
+        ["by #{section_name}", send("related_by_#{section_name}_items")]
+      end
+    end
   end
 
   view :rules_tab, unknown: true do
@@ -27,7 +25,10 @@ format :html do
   end
 
   view :account_tab do
-    bridge_pills bridge_pill_items(account_items, "Account")
+    bridge_pill_sections "Account" do
+      [["Settings", account_details_items],
+       ["Content", account_content_items]]
+    end
   end
 
   view :follow_section, wrap: :slot, cache: :never do
@@ -44,36 +45,4 @@ format :html do
     field_nest(:discussion, view: :titled, title: "Discussion", show: :comment_box,
                             hide: [:menu])
   end
-
-  def account_items
-    %i[account roles created edited follow].map do |item|
-      if item == :account
-        [tr(:details), item, { view: :edit, hide: %i[edit_name_row edit_type_row] }]
-      else
-        [tr(item), item]
-      end
-    end
-  end
-
-  def bridge_pills items
-    list_tag class: "nav nav-pills _auto-single-select bridge-pills flex-column",
-             items: { class: "nav-item" } do
-      items
-    end
-  end
-
-  def bridge_pill_items data, breadcrumb
-    data.map do |text, field, extra_opts|
-      opts = bridge_link_opts.merge("data-toggle": "pill")
-      opts.merge! breadcrumb_data(breadcrumb)
-      if extra_opts
-        classes = extra_opts.delete :class
-        add_class opts, classes if classes
-        opts.deep_merge! extra_opts
-      end
-      opts["data-cy"] = "#{text.to_name.key}-pill"
-      add_class opts, "nav-link"
-      link_to_card [card, field], text,  opts
-    end
-  end
 end

data/mod/edit/set/all/bridge/tab_visibility.rb

@@ -10,7 +10,7 @@ format :html do
   def show_account_tab?
     return unless card.real?
 
-    card.account && card.ok?(:update)
+    card.account&.ok?(:update)
   end
 
   def show_engage_tab?
@@ -39,7 +39,7 @@ format :html do
     d_card = discussion_card
     return unless d_card
 
-    permission_task = d_card.new_card? ? :comment : :read
+    permission_task = d_card.new_card? ? :update : :read
     d_card.ok? permission_task
   end
 

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

@@ -1,5 +1,5 @@
 format :html do
-  view :edit_content_form, wrap: :slot do
+  view :edit_form, wrap: :slot do
     voo.show :edit_type_row
     with_nest_mode :edit do
       edit_form
@@ -19,7 +19,7 @@ format :html do
         # render to get voo.slot_options to have the write home view in
         # the slot wrap. Id think this would probably best be handled as an
         # option to #wrap that triggers a new heir voo
-        _render_content_formgroup,
+        _render_content_formgroups,
         _render_edit_buttons
       ]
     end
@@ -37,7 +37,7 @@ format :html do
       wrap true do
         [
           frame_help,
-          _render_edit_content_form
+          _render_edit_form
         ]
       end
     end

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

@@ -5,7 +5,7 @@ format :html do
       card_form :update, success: edit_success do
         [
           edit_view_hidden,
-          _render_content_formgroup,
+          _render_content_formgroups,
           _render_edit_inline_buttons
         ]
       end
@@ -13,7 +13,7 @@ format :html do
   end
 
   view :edit_name_row do
-    edit_row_fixed_width "Name", card.name, :edit_name_form
+    edit_row_fixed_width "Name", card.name, :name_form
   end
 
   view :edit_inline_buttons do
@@ -24,10 +24,21 @@ format :html do
     end
   end
 
-  def edit_row_fixed_width title, content, edit_view
+  # TODO: better styling for this so that is reusable
+  #  At the moment it is used for the name and type field in the bridge
+  #  (with fixed 50px width for the title column) and
+  #  for password and email for accounts (with fixed 75px width for the title column)
+  #  The view is very similar to labeled but with fixed edit link on the right
+  #  and a fixed width for the labels so that the content column is aligned
+  #  There is also the problem that label and content are not vertically aligned
+  view :edit_row do
+    edit_row_fixed_width render_title, render_core, :edit_inline, 75
+  end
+
+  def edit_row_fixed_width title, content, edit_view, width=50
     class_up "card-slot", "d-flex"
     wrap do
-      ["<label class='w-50px'>#{title}</label>",
+      ["<label class='w-#{width}px'>#{title}</label>",
        content,
        edit_inline_link(edit_view, align: :right)]
     end

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

@@ -1,17 +1,15 @@
 format :html do
   # note: depends on js with selector ".edit_name-view .card-form"
   view :edit_name, perms: :update do
-    frame do
-      edit_name_form
-    end
+    frame { name_form }
   end
 
-  # note: depends on js with selector ".edit_name_form-view .card-form"
-  view :edit_name_form, perms: :update, wrap: :slot, cache: :never do
-    edit_name_form :edit_name_row
+  # note: depends on js with selector ".name_form-view .card-form"
+  view :name_form, perms: :update, wrap: :slot, cache: :never do
+    name_form :edit_name_row
   end
 
-  def edit_name_form success_view=nil
+  def name_form success_view=nil
     card_form({ action: :update, id: card.id },
               # "main-success" => "REDIRECT",
               "data-update-origin": "true",