card-mod-rules 0.14.2 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2733a5d2df6bc6fa427dfb6df3aa13ffb85d4b32ddf759a7990f037fcb3a3b9
-  data.tar.gz: ff7c40f3a993928c7b833fc589d4a43aae80c0f7d93698f6f42a7dbd6dd71555
+  metadata.gz: 4ecb97a316ef0bfee6882f767ca857ee54fbf40ed881237ebd065242e673a48f
+  data.tar.gz: 23eb3ef3989cd20109fbc57bbaff9aaca02cdb7d40ea8a1c955cdb0b448ebe39
 SHA512:
-  metadata.gz: 2b0c25189e2105259f1bcfcba4c6f3785b55e3fd8ab2049bc41ceb11ebec92b71d7dcf88bd9fd2c21a36cd9d413473b43178f4678453ce217e7b6ac72d25f36e
-  data.tar.gz: b00f03bee16d250abe7b1043e6ff7bc57ab937818c26c62076bb13fce35b440bc4f618902ef469aaea9b65563806efcedc91ef835f0fd1d7cf4b9378e7817ec3
+  metadata.gz: 7e27e841c4b8be319ab4bb181f2f90b69cb44a19dce7cf80f88e88bcb95052cee0a346300f82c14466cb4cac0e5a9080ac44d7968dc7503649be94cd02858ea5
+  data.tar.gz: a021b5396339c33ce1dd7e2f3a0ce2e902c317993ee688817df866d67232be39777b001bded3d681ae25aece75012601f8b76c39e0ea66feb125a5998d9b600c

data/assets/script/rules.js.coffee

@@ -0,0 +1,52 @@
+decko.slot.ready (slot)->
+  slot.find('._setting-filter').each () ->
+    decko.filterRulesByCategory $(this).closest(".card-slot"), $(this).find('input._setting-category:checked').attr("id")
+
+$.extend decko,
+  filterRulesByCategory: (container, category) ->
+    $(container).find('._setting-list ._setting-group').each (_i) ->
+      $list = $(this)
+      items = $list.find('._rule-item')
+      hiddenCount = 0
+      items.each () ->
+        $item = $(this)
+        wrapper = if $item.parent().is("li") then $item.parent() else $item
+        if $item.hasClass("_category-#{category}")
+          wrapper.show()
+        else
+          wrapper.hide()
+          hiddenCount += 1
+
+      if (hiddenCount == items.length)
+        $list.hide()
+      else
+        $list.show()
+        $list.find('._count').html(items.length - hiddenCount)
+
+$(window).ready ->
+  # permissions mod
+  $('body').on 'click', '.perm-vals input', ->
+    $(this).slot().find('#inherit').attr('checked',false)
+
+  $('body').on 'click', '.perm-editor #inherit', ->
+    slot = $(this).slot()
+    slot.find('.perm-group input:checked').attr('checked', false)
+    slot.find('.perm-indiv input').val('')
+
+  # rstar mod
+  $('body').on 'click', '._rule-submit-button', ->
+    f = $(this).closest('form')
+    checked = f.find('._set-editor input:checked')
+    if checked.val()
+      if checked.attr('warning')
+        confirm checked.attr('warning')
+      else
+        true
+    else
+      f.find('._set-editor').addClass('warning')
+      $(this).notify 'To what Set does this Rule apply?'
+      false
+
+  $('body').on 'click', 'input._setting-category', ->
+    category = $(this).attr("id")
+    decko.filterRulesByCategory($(this).closest('.card-slot'), category)

data/assets/style/rules.scss

@@ -0,0 +1,143 @@
+
+/*-------------------------- */
+/*- SETS, SETTINGS, RULES  - */
+/*-------------------------- */
+
+.setting-klass,
+.rule-setting {
+  font-weight: bold;
+}
+
+.rule-set {
+  white-space: nowrap;
+}
+
+.closed-rule {
+  height: 30px;
+  .rule-content {
+    width: 350px;
+  }
+}
+
+.rule-content-container {
+  max-width: 350px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  line-height: inherit;
+  background: inherit;
+  white-space: nowrap;
+  .closed-content,
+  .closed-content .pointer-list,
+  .closed-content .search-list {
+    margin: 0;
+  }
+}
+.rule-setting {
+  padding-top: 4px;
+}
+.open-rule > .rule-setting {
+  width: 28%;
+  float: left;
+}
+.open-rule .d0-card-body {
+  clear: both;
+}
+.open-rule .rule-instruction {
+  float: right;
+  text-align: left;
+  max-width: 68%;
+}
+.edit-rule,
+.set-list{
+  .set-editor {
+    ul {
+      list-style-type: none;
+    }
+    .current-set-label {
+      font-weight: bold;
+    }
+  }
+  .edit-button-area {
+    clear: both;
+    padding-top: 5px;
+  }
+}
+.rule-delete-section {
+  float: right;
+}
+.guide-line-number {
+  display: inline-block;
+  background: #000;
+  color: $white;
+  border-radius: 100%;
+  width: 21px;
+  height: 21px;
+  font-size: 61%;
+  text-align: center;
+  padding-top: 3px;
+  font-weight: bold;
+  margin-left: -1.7rem;
+  position: relative;
+  top: -5px;
+  left: -4px;
+}
+
+.guide-line {
+  border-left: 1px solid $border-color;
+}
+
+.rule-section {
+  padding-left: 20px;
+  margin-left: 12px;
+  margin-right: 5px;
+  h4 {
+    position: relative;
+    top: -4px;
+  }
+}
+
+.template_link-view {
+  display: inline;
+}
+
+.rule-item {
+  h5 {
+    font-weight: bold;
+  }
+  background-color: $list-group-bg;
+  border: 1px solid $list-group-border-color;
+  border-left: 5px solid $list-group-border-color;
+  margin-bottom: -1px;
+  padding: 5px;
+  &:hover, &.active {
+    border-left-color: $list-group-active-bg;
+  }
+}
+
+// reduce bottom margins
+.card-slot.set-info {
+  .form-group {
+    margin-bottom: 0.3rem;
+    label {
+      margin-bottom: 0.2rem;
+    }
+  }
+  p {
+    margin-bottom: 0.5rem;
+  }
+}
+
+.help-text.rule-instruction > div p:last-child {
+  margin-bottom: 0;
+}
+
+a.setting-link {
+  font-style: italic;
+  margin-left: 2%;
+  font-weight: normal;
+  color: $black;
+  white-space: nowrap;
+}
+h2.set-label {
+  padding-bottom: 10px;
+}

data/data/files/mod_rules_script_asset_output/file.js

@@ -0,0 +1,2 @@
+// rules.js.coffee
+(function(){decko.slot.ready(function(t){return t.find("._setting-filter").each(function(){return decko.filterRulesByCategory($(this).closest(".card-slot"),$(this).find("input._setting-category:checked").attr("id"))})}),$.extend(decko,{filterRulesByCategory:function(t,i){return $(t).find("._setting-list ._setting-group").each(function(){var t,n,e;return e=(t=$(this)).find("._rule-item"),n=0,e.each(function(){var t,e;return e=(t=$(this)).parent().is("li")?t.parent():t,t.hasClass("_category-"+i)?e.show():(e.hide(),n+=1)}),n===e.length?t.hide():(t.show(),t.find("._count").html(e.length-n))})}}),$(window).ready(function(){return $("body").on("click",".perm-vals input",function(){return $(this).slot().find("#inherit").attr("checked",!1)}),$("body").on("click",".perm-editor #inherit",function(){var t;return(t=$(this).slot()).find(".perm-group input:checked").attr("checked",!1),t.find(".perm-indiv input").val("")}),$("body").on("click","._rule-submit-button",function(){var t,i;return(t=(i=$(this).closest("form")).find("._set-editor input:checked")).val()?!t.attr("warning")||confirm(t.attr("warning")):(i.find("._set-editor").addClass("warning"),$(this).notify("To what Set does this Rule apply?"),!1)}),$("body").on("click","input._setting-category",function(){var t;return t=$(this).attr("id"),decko.filterRulesByCategory($(this).closest(".card-slot"),t)})})}).call(this);

data/data/files/mod_rules_script_local_machine_output/file.js

@@ -0,0 +1,31 @@
+// script_rules.js.coffee
+(function() {
+  $(window).ready(function() {
+    $('body').on('click', '.perm-vals input', function() {
+      return $(this).slot().find('#inherit').attr('checked', false);
+    });
+    $('body').on('click', '.perm-editor #inherit', function() {
+      var slot;
+      slot = $(this).slot();
+      slot.find('.perm-group input:checked').attr('checked', false);
+      return slot.find('.perm-indiv input').val('');
+    });
+    return $('body').on('click', '._rule-submit-button', function() {
+      var checked, f;
+      f = $(this).closest('form');
+      checked = f.find('.set-editor input:checked');
+      if (checked.val()) {
+        if (checked.attr('warning')) {
+          return confirm(checked.attr('warning'));
+        } else {
+          return true;
+        }
+      } else {
+        f.find('.set-editor').addClass('attention');
+        $(this).notify('To what Set does this Rule apply?');
+        return false;
+      }
+    });
+  });
+
+}).call(this);

data/data/real.yml

@@ -0,0 +1,27 @@
+---
+- :name: Setting
+  :type: :cardtype
+  :codename: setting
+  :fields:
+    :description: |-
+      Settings affect how cards look and behave. 
+      [[http://www.decko.org/Setting|Learn more about settings.]]
+    :self:
+      :fields:
+        :update: Administrator
+- :name: Set
+  :type: :cardtype
+  :codename: set
+  :fields:
+    :description: |-
+      Sets define a group of cards to which settings can apply.
+      [[http://www.decko.org/Set|Learn more about sets.]]
+    :self:
+      :fields:
+        :structure: |-
+          <p>{{+description}}</p>
+          <h1>{{_self|name}} Cards</h1>
+          <blockquote>
+          <p>{{+:type+:by_name}}</p>
+          </blockquote>
+

data/locales/de.yml

@@ -1,4 +1,5 @@
 de:
+  rules_header: Regeln
   rules_config: Konfiguration
   rules_event: Ereignisse
   rules_other: Sonstige

data/locales/en.yml

@@ -1,4 +1,5 @@
 en:
+  rules_header: Rules
   rules_config: Config
   rules_event: Events
   rules_other: Other

data/set/abstract/virtual_set.rb

@@ -0,0 +1,3 @@
+def virtual?
+  new?
+end

data/set/all/cardtype_groups.rb

@@ -7,8 +7,7 @@ GROUP = {
   "Organize" => ["List", "Pointer", "Search", "Link list", "Nest list"],
   "Template" => ["Notification template", "Email template", "Twitter template"],
   "Admin" => ["Cardtype", "User", "Role", "Sign up", "Session", "Set", "Setting"],
-  "Styling" => ["Layout", "Skin", "Bootswatch skin", "Customized bootswatch skin",
-                "CSS", "SCSS"],
+  "Styling" => ["Layout", "Skin", "Bootswatch skin", "CSS", "SCSS"],
   "Scripting" => %w[JSON JavaScript CoffeeScript]
 }.freeze
 

data/set/all/related_sets.rb

@@ -3,23 +3,7 @@ def related_sets with_self=false
   # NOT to sets to which the current card belongs
 
   [].tap do |sets|
-    sets << [self_set_name, self_set_label] if with_self
-    sets << [right_set_name, right_set_label] if known? && simple?
+    sets << Card.fetch(name, :self) if with_self
+    sets << Card.fetch(name, :right) if known? && simple?
   end
 end
-
-def self_set_name
-  Name[name, :self]
-end
-
-def self_set_label
-  Card::Set::Self.label name
-end
-
-def right_set_name
-  Name[name, :right]
-end
-
-def right_set_label
-  Card::Set::Right.label name
-end

data/set/all/set_select.rb

@@ -0,0 +1,58 @@
+format :html do
+  def set_select set_list_type,
+                 setting_list_view=:filtered_accordion_rule_list,
+                 path_opts={}
+    card_select card.set_list(set_list_type), setting_list_view, path_opts, "Select set"
+  end
+
+  def card_select cards, view, path_opts={}, placeholder=nil
+    form_tag path(path_opts.merge(view: view, mark: "")),
+             remote: true, method: "get", role: "filter",
+             "data-slot-selector": ".card-slot._fixed-slot",
+             class: "nodblclick slotter" do
+      output [
+        set_select_tag(cards, placeholder),
+        content_tag(:div, "", class: "card-slot _fixed-slot")
+      ]
+    end
+  end
+
+  view :card_select, wrap: :slot do
+    card_select card.set_list(:related),
+                :filtered_accordion_rule_list, {}, "Select set"
+  end
+
+  private
+
+  def set_select_tag cards, placeholder=nil
+    options = cards.map(&:label_and_url_key)
+    options.unshift("") if placeholder
+    select_tag(:mark, options_for_select(options),
+               class: "_submit-on-select form-control _close-rule-overlay-on-select",
+               "data-minimum-results-for-search": "Infinity",
+               "data-placeholder": "Select set",
+               "data-select2-id": "#{unique_id}-#{Time.now.to_i}")
+  end
+
+  def set_alert set_list_type
+    wrap_with :div, class: "alert alert-info" do
+      [
+        "Rules apply to:",
+        card.set_list(set_list_type).first.name,
+        link_to_card(card, "More sets and settings",
+                     path: { view: :rules }, target: "_blank")
+      ]
+    end
+  end
+end
+
+def set_list set_list_type
+  case set_list_type
+  when :related
+    related_sets(true)
+  when :broader
+    broader_sets
+  else
+    [Card[self, :self]]
+  end
+end

data/set/right/right.rb

@@ -0,0 +1,7 @@
+include_set Abstract::VirtualSet
+
+assign_type :set
+
+def cql_content
+  { right: "_left" }
+end

data/set/right/self.rb

@@ -1,3 +1,11 @@
+include_set Abstract::VirtualSet
+
+assign_type :set
+
+def cql_content
+  { name: "_left" }
+end
+
 def prototype_default_card
   left
 end

data/set/right/type.rb

@@ -0,0 +1,7 @@
+include_set Abstract::VirtualSet
+
+assign_type :set
+
+def cql_content
+  { type: "_left" }
+end

data/set/right/type_plus_right.rb

@@ -1,4 +1,11 @@
+include_set Abstract::VirtualSet
+
+assign_type :set
+
+def cql_content
+  { left: { type: "_LL" }, right: "_LR" }
+end
+
 def related_sets _with_self=false
-  [[name, Card::Set::TypePlusRight.label(name.left)],
-   ["#{name[1]}+*right", Card::Set::Right.label(name[1])]]
+  [self, Card.fetch(name[1], :right)]
 end

data/set/rule/bar_view.rb

@@ -1,20 +1,17 @@
 format :html do
-  bar_cols 6, 6
-  info_bar_cols 5, 4, 3
+  mini_bar_cols 6, 6
+  bar_cols 5, 4, 3
 
   def existing_rule_card
     @existing_rule_card ||= find_existing_rule_card
   end
 
   view :bar, unknown: true do
+    class_up "card-slot", "_rule-item #{category_classes}"
     voo.hide :bar_nav unless existing_rule_card
     super()
   end
 
-  view :expanded_bar, unknown: true do
-    super()
-  end
-
   view :one_line_content,
        wrap: { div: { class: "text-muted one-line" } }, unknown: true do
     return render_mini_unknown unless existing_rule_card
@@ -40,15 +37,11 @@ format :html do
   end
 
   view :bar_middle, unknown: true do
-    rule_info
-  end
-
-  view :bar_left, unknown: true do
-    super()
+    # rule_info
   end
 
   view :bar_right, unknown: true do
-    voo.show?(:bar_bottom) ? rule_info : rule_short_content
+    rule_short_content
   end
 
   def rule_short_content
@@ -59,35 +52,31 @@ format :html do
          { set_context: card.name.trunk_name }
   end
 
-  def bar_title
-    return super() if voo.show? :full_name
-
-    linking_to_existing_rule { card.rule_setting_title }
-  end
+  private
 
   # LOCALIZE
   def rule_info
-    return wrap_with(:em, "no existing #{setting_link} rule") unless existing_rule_card
-
-    wrap_with :span,
-              "#{rule_setting_link} rule that applies to "\
-              "#{rule_set_link existing_rule_card}"
+    if existing_rule_card
+      wrap_with :span,
+                "#{rule_setting_link} rule that applies to #{existing_rule_set_link}"
+    else
+      wrap_with :em, "no existing #{rule_setting_link} rule"
+    end
   end
 
   def rule_setting_link
-    link_to_card card.rule_setting, card.rule_setting_name
+    link_to_card card.rule_setting, card.rule_setting_name, class: "_over-card-link"
   end
 
-  def rule_set_link existing_rule
-    count = link_to_card [card.rule_set, :by_name], card.rule_set.count
-    "#{link_to_card card.rule_set, existing_rule.trunk&.label&.downcase} (#{count})"
+  def existing_rule_set_link
+    rule_set_link existing_rule_card
   end
 
-  private
-
-  def linking_to_existing_rule
-    return yield unless existing_rule_card && voo.show?(:toggle)
-
-    link_to_view bar_title_toggle_view, yield
+  def rule_set_link existing_rule
+    count = link_to_card [card.rule_set, :by_name], card.rule_set.count
+    link = link_to_card card.rule_set,
+                        existing_rule.trunk&.label&.downcase,
+                        class: "_over-card-link"
+    "#{link} (#{count})"
   end
 end

data/set/rule/bridge_rules_editor.rb

@@ -19,7 +19,7 @@ format :html do
   end
 
   def setting_link
-    wrap_with :div, class: "ml-auto" do
+    wrap_with :div, class: "ms-auto" do
       link_to_card card.rule_setting_name,
                    " (#{card.rule_setting.count} #{card.rule_setting_title} rules)",
                    class: "text-muted"

data/set/rule/editor.rb

@@ -5,7 +5,7 @@ def left_type_for_nest_editor_set_selection
   when TypeID
     rule_set.anchor_name
   when SelfID
-    rule_set.anchor.type_name
+    rule_set.anchor&.type_name || Card.new(name: rule_set.anchor_name).type_name
   else
     super
   end
@@ -27,12 +27,34 @@ format :html do
     end
   end
 
+  view :rule_nest_editor_link, unknown: true do
+    pill_rule_link :modal_rule
+  end
+
   view :rule_bridge_link, unknown: true do
-    opts = bridge_link_opts(class: "edit-rule-link nav-link",
-                            "data-toggle": "pill",
-                            "data-cy": "#{setting_title.to_name.key}-pill")
+    pill_rule_link :overlay_rule
+  end
+
+  def pill_rule_link target_view
+    link_to_view target_view, (setting_title + short_help_text),
+                 pill_rule_link_opts
+  end
+
+  def pill_rule_link_opts
+    opts = bridge_link_opts(
+      class: "edit-rule-link nav-link _rule-item #{category_classes}",
+      "data-bs-toggle": "pill",
+      "data-category": card.rule_set.categories(card.rule_setting.codename).join(" "),
+      "data-cy": "#{setting_title.to_name.key}-pill"
+    )
     opts[:path].delete(:layout)
-    link_to_view(:overlay_rule, (setting_title + short_help_text), opts)
+    opts
+  end
+
+  def category_classes
+    card.rule_set.categories(card.rule_setting.codename)
+        .map { |cat| "_category-#{cat}" }
+        .join(" ")
   end
 
   def edit_link_view
@@ -41,7 +63,7 @@ format :html do
 
   def edit_rule_title
     output [
-      wrap_with(:h5, setting_title, class: "title font-weight-bold")
+      wrap_with(:h5, setting_title, class: "title fw-bold")
       # render_overlay_rule_help
     ]
   end
@@ -78,7 +100,7 @@ format :html do
     success = @edit_rule_success
     wrap_type_formgroup do
       type_field(
-        href: path(mark: success[:id], view: :rule_form, assign: true),
+        href: path(mark: success[:id], view: :rule_form_card_editor, assign: true),
         class: "type-field rule-type-field _live-type-field",
         "data-remote" => true
       )

data/set/rule/quick_editor/quick_edit.haml

@@ -1,5 +1,5 @@
-.rule-item
-  %h6.font-weight-bold
+.rule-item._rule-item{ class: category_classes }
+  %h6.fw-bold
     = setting_title
   = short_help_text
   = quick_form

data/set/rule/quick_editor.rb

@@ -30,7 +30,7 @@ format :html do
 
   def undo_button
     link_to "undo", method: :post, rel: "nofollow", remote: true,
-                    class: "btn btn-secondary ml-2 btn-sm btn-reduced-padding slotter",
+                    class: "btn btn-secondary ms-2 btn-sm btn-reduced-padding slotter",
                     "data-slot-selector": ".card-slot.quick_edit-view",
                     path: { action: :update,
                             revert_actions: [card.last_action_id],

data/set/rule/rule_form/rule_form.haml

@@ -3,9 +3,7 @@
     .guide-line-number 1
     Define rule
     -# = popover_link "Help text to explain this section"
-  .card-editor
-    = rules_type_formgroup
-    = rule_content_formgroup
+  = render(:rule_form_card_editor)
 .rule-section
   %h5
     .guide-line-number 2