card 1.99.1 → 1.99.2

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

@@ -84,9 +84,9 @@ format :html do
     return super unless card.is_template?
 
     case Card.fetch_id(card.rule_set_pattern_name) # set_pattern_id
-    when TypeID
+    when Card::TypeID
       card.rule_set.anchor_name
-    when SelfID
+    when Card::SelfID
       card.rule_set.anchor.type_name
     else
       super

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

@@ -32,7 +32,7 @@ format :html do
   def rule_list_item setting, view, opts={}
     return "" unless show_view? setting
 
-    rule_card = card.fetch trait: setting, new: {}
+    rule_card = card.fetch setting, new: {}
     nest(rule_card, opts.merge(view: view)).html_safe
   end
 

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

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

data/mod/search/set/abstract/03_filter/filter_form.haml

@@ -14,8 +14,8 @@
                                     method: "get"}
         - not_ids = params.dig :filter, :not_ids
         %input{ type: :hidden, name: "filter[not_ids]", class: "_not-ids", value: not_ids }
+        = render_quick_filters
         .d-flex.flex-wrap
-          = render_quick_filters
           - if sort_input_field.present?
             // SORTING
             .sort-in-filter-form

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

@@ -5,16 +5,37 @@ format :html do
                   sort_field: _render(:sort_formgroup)
   end
 
-  view :quick_filters do
+  view :quick_filters, cache: :never do
     return "" unless quick_filter_list.present?
 
-    haml :quick_filters
+    haml :quick_filters, filter_list: normalized_quick_filter_list
   end
 
+  def normalized_quick_filter_list
+    quick_filter_list.map do |hash|
+      hash = hash.clone
+      filter_key = hash.keys.first
+      {
+        text: (hash.delete(:text) || hash[filter_key]),
+        icon: (hash.delete(:icon) || mapped_icon_tag(filter_key)),
+        # FIXME: mapped_icon_tag is a wikirate concept
+        class:  css_classes(hash.delete(:class),
+                            "_filter-link quick-filter-by-#{filter_key}"),
+        filter: JSON(hash[:filter] || hash)
+      }
+    end
+  end
+
+  # for override
   def quick_filter_list
     []
   end
 
+  # for override
+  def custom_quick_filters
+    ""
+  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={}

data/mod/search/set/abstract/03_filter/quick_filters.haml

@@ -1,14 +1,11 @@
 .quick-filter._quick-filter
   %i.fa.fa-bolt.filter-section-icon
   .quick-filter-links.d-flex.flex-wrap
-    - quick_filter_list.each do |hash|
-      - link_hash = JSON(hash)
-      - filter_key = hash.keys.first
-      - value = hash.values.first
-      %a{ "data-filter": link_hash,
+    - filter_list.each do |f|
+      %a{ "data-filter": f[:filter],
           href: "#",
-          class: "quick-filter-by-#{filter_key}",
-          title: "Quick Filter" }
-        = mapped_icon_tag filter_key
-        // FIXME: mapped_icon_tag is WikiRate concept
-        = value
+          class: f[:class],
+          title: "Quick Filter: #{f[:text]}" }
+        = f[:icon]
+        = f[:text]
+    = custom_quick_filters

data/mod/search/template/abstract/search/checkbox_item.haml

@@ -1,7 +1,6 @@
 
-%table.search-checkbox-item._search-checkbox-item.w-100
-  %tr
-    %td.checkbox-side
-      = check_box_tag item_card.name, item_card.key
-    %td.item-view-side{ style: "background: #fff" }
-      = nest_item item_card
+.search-checkbox-item._search-checkbox-item.w-100.d-flex
+  .checkbox-side
+    = check_box_tag item_card.name, item_card.key
+  .item-view-side{ style: "background: #fff" }
+    = nest_item item_card

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

@@ -64,7 +64,7 @@ format :html do
 
   def group_options
     Auth.as_bot do
-      Card.search({ type_id: RoleID, sort: "name" }, "roles by name")
+      Card.search({ type_id: Card::RoleID, sort: "name" }, "roles by name")
     end
   end
 
@@ -73,7 +73,7 @@ format :html do
       begin
         set_name = card.name.trunk_name
         set_card = Card.fetch(set_name)
-        not_set = set_card && set_card.type_id != SetID
+        not_set = set_card && set_card.type_id != Card::SetID
         not_set ? false : set_card.inheritable?
       end
   end

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

@@ -17,9 +17,9 @@ format :html do
     "edit interface for list cards"
   end
 
-  def option_label_text option_name
-    super.downcase
-  end
+  # def option_label_text option_name
+  #   super.downcase
+  # end
 
   def quick_edit
     card.left.prototype_default_card.try(:show_input_type?) ? super : ""

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

@@ -66,7 +66,7 @@ end
 
 def structuree_query args={}
   set_card = trunk
-  return unless set_card.type_id == SetID
+  return unless set_card.type_id == Card::SetID
 
   set_card.fetch_query args
 end

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

@@ -38,7 +38,7 @@ end
 
 event :customize_theme, :prepare_to_validate, on: :update, when: :customize_theme? do
   skin_name = free_skin_name
-  add_subcard skin_name, type_id: CustomizedBootswatchSkinID
+  add_subcard skin_name, type_id: Card::CustomizedBootswatchSkinID
   self.content = "[[#{skin_name}]]"
 end
 

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

@@ -1,9 +1,9 @@
-require_dependency "json"
+# require "json"
 
 def self.member_names
   @@member_names ||= begin
     Card.search(
-      { type_id: SettingID, return: "key" },
+      { type_id: Card::SettingID, return: "key" },
       "all setting cards"
     ).each_with_object({}) do |card_key, hash|
       hash[card_key] = true

data/mod/standard/set/all/rich_html/html_views/guide.rb

@@ -2,7 +2,7 @@ def guide_card
   guide_card = rule_card(:guide)
   return unless guide_card
 
-  guide_card = guide_card.item_cards.first if guide_card.type_id == Card::PointerID
+  guide_card = guide_card.first_card if guide_card.type_id == Card::PointerID
   guide_card if guide_card.ok?(:read)
 end
 

data/mod/standard/set/all/rich_html/menu.rb

@@ -59,18 +59,19 @@ format :html do
   # no caching because help_text view doesn't cache, and we can't have a
   # stub in the data-content attribute or it will get html escaped.
   view :help_link, cache: :never, unknown: true do
-    help_link
+    help_link render_help_text, help_title
   end
 
-  def help_link
-    opts = help_popover_opts
+  def help_link text=nil, title=nil
+    opts = help_popover_opts text, title
     add_class opts, "_card-menu-popover"
     link_to help_icon, opts
   end
 
-  def help_popover_opts
+  def help_popover_opts text=nil, title=nil
+    text ||= render_help_text
     opts = { "data-placement": :left, class: "help-link" }
-    popover_opts render_help_text, help_title, opts
+    popover_opts text, title, opts
   end
 
   def help_icon

data/mod/standard/set/self/cardtype.rb

@@ -32,7 +32,7 @@ format :html do
   def custom_types
     custom_types = []
 
-    Card.search(type_id: CardtypeID, return: "name").each do |name|
+    Card.search(type_id: Card::CardtypeID, return: "name").each do |name|
       next if ::Card::Set::Self::Cardtype::GROUP_MAP[name]
 
       custom_types << name

data/mod/standard/set/type/cardtype.rb

@@ -30,34 +30,39 @@ format :html do
   end
 
   view :add_button do
-    add_link "btn btn-secondary"
+    add_link class: "btn btn-secondary"
   end
 
-  def add_link css_class=nil
+  def add_link opts={}
     voo.title ||= tr(:add_card, cardname: safe_name)
-    title = _render_title
-    link_to title, modal_link_opts(class: css_class, path: _render_add_path)
+    link_to render_title, add_link_opts(opts)
+  end
+
+  def add_link_opts opts
+    modal = opts.delete :modal
+    modal = true if modal.nil?
+    opts[:path] = add_path(modal ? :new_in_modal : :new)
+    modal ? modal_link_opts(opts) : opts
   end
 
   view :add_url do
     card_url _render_add_path
   end
 
-  view :add_path do
-    path_args = {}
-    if voo.params
-      context = ((@parent&.card) || card).name
-      Rack::Utils.parse_nested_query(voo.params).each do |key, value|
-        value = value.to_name.absolute(context) if value
-        key = key.to_name.absolute(context)
-        path_args[key] = value
-      end
+  def add_path view
+    path_args = { mark: card.name }
+    process_voo_params(path_args) if voo.params
+    if view == :new
+      path_args[:action] = :new
+    else
+      path_args[:action] = :type
+      path_args[:view] = view
     end
-    path path_args.merge(action: :type, mark: card.name, view: :new_in_modal)
+    path path_args
   end
 
   # don't cache because it depends on update permission for another card
-  view :configure_link, cache: :never, perms:  ->(fmt) { fmt.can_configure? } do
+  view :configure_link, cache: :never, perms: ->(fmt) { fmt.can_configure? } do
     configure_link
   end
 
@@ -77,7 +82,18 @@ format :html do
     title = _render_title
     link_to_card card, title, path: { view: :bridge, bridge: { tab: :rules_tab },
                                       set: Card::Name[safe_name, :type] },
-                              class: css_class
+                              class: css_classes("configure-type-link ml-3", css_class)
+  end
+
+  private
+
+  def process_voo_params path_args
+    context = ((@parent&.card) || card).name
+    Rack::Utils.parse_nested_query(voo.params).each do |key, value|
+      value = value.to_name.absolute(context) if value
+      key = key.to_name.absolute(context)
+      path_args[key] = value
+    end
   end
 end
 
@@ -92,7 +108,7 @@ def create_ok?
 end
 
 def was_cardtype?
-  type_id_before_act == CardtypeID
+  type_id_before_act == Card::CardtypeID
 end
 
 event :check_for_cards_of_type, after: :validate_delete do

data/mod/standard/set/type/session.rb

@@ -12,6 +12,10 @@ def followable?
   false
 end
 
+def recaptcha_on?
+  false
+end
+
 def session_key
   "_card_#{key}"
 end
@@ -38,6 +42,14 @@ event :delete_in_session, :prepare_to_store, on: :delete do
   abort :success
 end
 
+def ok_to_create
+  true
+end
+
+def ok_to_update
+  true
+end
+
 def add_to_trash args
   yield args.merge trash: true
 end

data/mod/standard/spec/set/type/email_template/email_config_spec.rb

@@ -1,6 +1,5 @@
 # -*- encoding : utf-8 -*-
 
-require "card/mailer"
 require "card/seed_consts"
 
 describe Card::Set::Type::EmailTemplate::EmailConfig do
@@ -20,7 +19,7 @@ describe Card::Set::Type::EmailTemplate::EmailConfig do
   end
 
   before do
-    Card::Auth.current_id = Card::WagnBotID
+    Card::Auth.signin Card::WagnBotID
     chunk_test = "Url(decko.org) Link([[https://decko.org|Decko]])"\
                  " Inclusion({{B|name}}) Card link([[A]])"
     Card.create! name: email_name, type: :email_template, subcards: {

data/mod/standard/spec/set/type/email_template_spec.rb

@@ -1,11 +1,9 @@
 # -*- encoding : utf-8 -*-
 
-require "card/mailer"
-
 describe Card::Set::Type::EmailTemplate do
   describe "#mail" do
     let(:content_type) do
-      Card::Auth.current_id = Card::WagnBotID
+      Card::Auth.signin Card::WagnBotID
       card = Card.create!(name: "content type test", type: :email_template,
                           subcards: @fields)
 

data/mod/tinymce_editor/lib/javascript/script_tinymce_config.js.coffee

@@ -29,7 +29,7 @@ $.extend decko,
       plugins: 'autoresize'
       autoresize_max_height: 500
       mobile: { theme: 'mobile' }
-      contextmenu: "link nest"
+      contextmenu: "deckolink nest"
     }
     user_conf = if decko.tinyMCEConfig? then decko.tinyMCEConfig else {}
     hard_conf = {
@@ -54,5 +54,6 @@ $.extend decko,
   addNestPlugin: (conf) ->
     if conf.plugins?  then conf.plugins += " nest"    else conf.plugins = "nest"
     # if conf.toolbar1? then conf.toolbar1 += " | nest" else conf.toolbar1 = "nest"
-    conf.menu = { insert: { title: "Insert", items: "nest image link | hr"}}
+    conf.menu = { insert: { title: "Insert", items: "deckolink nest image | hr"}}
+
 

data/mod/tinymce_editor/public/assets/tinymce/plugins/nest/plugin.min.js

@@ -1 +1 @@
-!function(){"use strict";var n=function(t){return function(){nest.openEditor(t)}},e=function(t){return function(){nest.openImageEditor(t)}},i=function(t){t.addCommand("mceNest",function(){n(t)()})},o=function(t){t.addShortcut("Meta+Z","",function(){t.execCommand("mceNest")})},u=function(t){t.ui.registry.addToggleButton("nest",{text:"{{}}",tooltip:"Insert/edit nest",onAction:n(t)}),t.ui.registry.addToggleButton("image",{text:"image",tooltip:"insert image",onAction:e(t)})},r=function(t){t.ui.registry.addMenuItem("nest",{text:"Nest...",context:"insert",onAction:n(t)}),t.ui.registry.addMenuItem("image",{text:"Image...",context:"insert",onAction:e(t)})},c=function(t){t.ui.registry.addContextMenu("nest",{update:function(){return"nest"}})};return tinymce.PluginManager.add("nest",function(t){u(t),r(t),c(t),i(t),o(t)}),function(){}}()();
+!function(){"use strict";var n=function(t){return function(){nest.openNestEditor(t)}},e=function(t){return function(){nest.openImageEditor(t)}},i=function(t){return function(){link.openLinkEditor(t)}},o=function(t){t.addCommand("mceNest",function(){n(t)()})},u=function(t){t.addShortcut("Meta+Z","",function(){t.execCommand("mceNest")})},c=function(t){t.ui.registry.addToggleButton("deckolink",{text:"[[]]",tooltip:"Insert/edit link",onAction:i(t)}),t.ui.registry.addToggleButton("nest",{text:"{{}}",tooltip:"Insert/edit nest",onAction:n(t)}),t.ui.registry.addToggleButton("image",{text:"image",tooltip:"insert image",onAction:e(t)})},r=function(t){t.ui.registry.addMenuItem("deckolink",{text:"Link...",context:"insert",icon:"deckolink",onAction:i(t)}),t.ui.registry.addMenuItem("nest",{icon:"nest",text:"Nest...",context:"insert",onAction:n(t)}),t.ui.registry.addMenuItem("image",{icon:"image",text:"Image...",context:"insert",onAction:e(t)})},d=function(t){t.ui.registry.addContextMenu("nest",{update:function(){return"nest"}})};return tinymce.PluginManager.add("nest",function(t){t.ui.registry.addIcon("deckolink","[[]]"),t.ui.registry.addIcon("nest","{{}}"),c(t),r(t),d(t),o(t),u(t)}),function(){}}()();

data/mod/tinymce_editor/set/all/reference_editor.rb

@@ -0,0 +1,23 @@
+# shared helper methods for link editor and nest editor
+
+format :html do
+  def tinymce_id
+    params[:tinymce_id]
+  end
+
+  def apply_tm_snippet_data snippet
+    data = { "data-tinymce-id": tinymce_id }
+    data[:"data-tm-snippet-start"] = tm_param(:start) if tm_param(:start).present?
+    data[:"data-tm-snippet-size"] = snippet.raw.size if tm_param(:raw).present?
+    data["data-dismiss"] = "modal" if modal_tm_snippet_editor?
+    data
+  end
+
+  def tm_param key
+    params[:"tm_snippet_#{key}"]
+  end
+
+  def modal_tm_snippet_editor?
+    @tm_snippet_editor_mode != :overlay
+  end
+end

data/mod/tinymce_editor/set/all/reference_editor/_link_editor.haml

@@ -0,0 +1,18 @@
+.form-row.align-items-center.mb-4.ml-1
+  .col-9
+    .input-group{class: [snippet.field? ? "show-prefix" : "hide-prefix"]}
+      .input-group-prepend._field-indicator
+        .input-group-text.text-muted
+          +
+      = text_field_tag "link_name", snippet.name, class: "form-control _link-target", placeholder: "URL or Card name"
+
+  .col-3
+    = check_box_tag :field, "field", snippet.field?,
+                    class: "_link-field-toggle", id: "link-editor-field"
+    %label.form-check-label{for: "link-editor-field"} field
+
+.form-row.align-items-center.mb-4.ml-1.mr-1
+  .col-12
+    %label.form-check-label{for: "link_title"} Text to display
+    = text_field_tag "link_title", snippet.title, class: "form-control _link-title"
+

data/mod/tinymce_editor/set/all/reference_editor/_nest_editor.haml

@@ -0,0 +1,17 @@
+.form
+  .form-row.align-items-center.mb-4.ml-1
+    .col-9
+      .input-group{class: [snippet.field? ? "show-prefix" : "hide-prefix"]}
+        .input-group-prepend._field-indicator
+          .input-group-text.text-muted
+            +
+        = text_field_tag "nest_name", snippet.name, class: "form-control _nest-name",
+                         "data-left-name" => card.name,
+                         "data-left-type" => left_type_for_nest_editor_set_selection,
+                         placeholder: "Card name"
+    .col-3
+      = check_box_tag :field, "field", snippet.field?,
+                      class: "_nest-field-toggle", id: "nest-editor-field"
+      %label.form-check-label{for: "nest-editor-field"} field
+
+  = nest_editor_tabs