card 1.96.8 → 1.97.0

data/mod/machines/set/abstract/machine.rb

@@ -164,9 +164,10 @@ end
 def make_machine_output_coded mod=:machines
   update_machine_output
   Card::Auth.as_bot do
-    machine_output_card.update! storage_type: :coded,
-                                mod: mod,
-                                codename: machine_output_codename
+    ENV["STORE_CODED_FILES"] = "true"
+    machine_output_card.update! storage_type: :coded, mod: mod,
+                                           codename: machine_output_codename
+    ENV["STORE_CODED_FILES"] = nil
   end
 end
 

data/mod/machines/set/self/script_slot.rb

@@ -2,8 +2,8 @@ include_set Abstract::CodeFile
 
 def source_files
   %w[decko_mod decko_editor decko_layout decko_navbox decko_upload
-     decko_filter decko_slot decko_recaptcha
-     decko_slotter decko].map do |n|
+     decko_filter decko_slot decko_modal decko_overlay decko_recaptcha
+     decko_slotter decko_bridge decko_components decko].map do |n|
     "#{n}.js.coffee"
   end
 end

data/mod/machines/set/type/css.rb

@@ -1,6 +1,8 @@
 # -*- encoding : utf-8 -*-
 
 require "sass"
+require "benchmark"
+
 include_set Abstract::Machine
 include_set Abstract::MachineInput
 
@@ -11,7 +13,7 @@ machine_input do
 end
 
 def compress_css input
-  Sass.compile input, style: :compressed
+  compress_css? ? Sass.compile(input, style: :compressed) : input
 rescue => e
   raise Card::Error, css_compression_error(e)
 end
@@ -32,6 +34,11 @@ def clean_html?
   false
 end
 
+def compress_css?
+  return true
+  !Rails.env.development?
+end
+
 format do
   # def default_nest_view
   #   :raw

data/mod/machines/set/type/skin.rb

@@ -2,9 +2,9 @@ include_set Abstract::MachineInput
 include_set Abstract::SkinBox
 include_set Pointer
 
-
 def machine_input
   # only the item of a skin card contribute input to the machine
   # not the skin card itself
   ""
 end
+

data/mod/machines/spec/set/type/coffeescript_spec.rb

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 
-describe Card::Set::Type::CoffeeScript do
+RSpec.describe Card::Set::Type::CoffeeScript do
   let(:coffee)                    { 'alert "Hi"  '    }
   let(:compressed_coffee)         { '(function(){alert("Hi")}).call(this);'    }
   let(:changed_coffee)            { 'alert "Hello"  ' }
@@ -24,7 +24,7 @@ describe Card::Set::Type::CoffeeScript do
       Card.gimme! "coffee input", type: :coffee_script, content: coffee
     end
     let(:create_another_machine_input_card) do
-      Card.gimme! "more coffee input", type: :coffee_script, content: coffee
+      Card.gimme! "more coffee input", type: :coffee_script, content: changed_coffee
     end
     let(:create_machine_card) do
       Card.gimme! "coffee machine+*script", type: :pointer
@@ -35,7 +35,7 @@ describe Card::Set::Type::CoffeeScript do
         changed_in:  changed_coffee,
         changed_out: "//coffee input\n#{compressed_changed_coffee}",
         added_out:   "//coffee input\n#{compressed_coffee}\n"\
-                     "//more coffee input\n#{compressed_coffee}" }
+                     "//more coffee input\n#{compressed_changed_coffee}" }
     end
   end
 end

data/mod/pointer/set/abstract/00_paging_params.rb

@@ -13,12 +13,14 @@ format do
 
   def env_search_param param
     return unless focal?
+
     val = Env.params[param]
     val.present? && val.to_i
   end
 
   def voo_search_param param
     return unless voo&.wql
+
     voo.wql[param]
   end
 end

data/mod/pointer/set/abstract/01_paging.rb

@@ -24,6 +24,10 @@ format do
   def current_page
     (offset / limit).to_i
   end
+
+  def extra_paging_path_args
+    {}
+  end
 end
 
 format :html do
@@ -37,6 +41,7 @@ format :html do
 
   view :paging, cache: :never do
     return "" unless paging_needed?
+
     <<-HTML
       <nav>
         <ul class="pagination paging">
@@ -66,6 +71,7 @@ format :html do
 
   def page_link text, page, options
     return content_tag(:div, text.html_safe, class: "page-link") unless page
+
     options.merge! class: "card-paging-link slotter page-link",
                    remote: true,
                    path: page_link_path_args(page)
@@ -97,16 +103,13 @@ format :html do
   end
 
   def paging_view
-    (voo && voo.home_view) || voo.slot_options[:view] || :content
-  end
-
-  def extra_paging_path_args
-    {}
+    voo&.home_view || voo.slot_options[:view] || :content
   end
 
   def paging_needed?
     return false if limit < 1
     return false if fewer_results_than_limit? # avoid extra count search
+
     # count search result instead
     limit < count_with_params
   end
@@ -114,6 +117,7 @@ format :html do
   # clear we don't need paging even before running count query
   def fewer_results_than_limit?
     return false unless offset.zero?
+
     limit > offset + search_with_params.length
   end
 end
@@ -125,11 +129,12 @@ format :json do
       offset: page * limit,
       item: default_item_view, # hack. need standard voo handling
       format: :json
-    }
+    }.merge extra_paging_path_args
   end
 
   def paging_urls
     return {} unless total_pages > 1
+
     { paging: paging_urls_hash }
   end
 
@@ -144,6 +149,7 @@ format :json do
 
   def add_paging_url hash, page, status
     return unless page && status.in?(%i[next previous])
+
     hash[status] = path page_link_path_args(page)
   end
 end

data/mod/pointer/set/abstract/02_pointer/html_views.rb

@@ -5,6 +5,12 @@ format :html do
     standard_pointer_core
   end
 
+  view :item_cores, cache: :never do
+    card.known_item_cards.map do |item|
+      nest item, view: :core
+    end.join "\n"
+  end
+
   def stat_number
     card.item_count
   end
@@ -13,6 +19,10 @@ format :html do
     stat_number == 1 ? "item" : "items"
   end
 
+  def short_content
+    "#{stat_number} #{stat_label}"
+  end
+
   def standard_pointer_core
     with_paging do |paging_args|
       wrap_with :div, standard_pointer_items(paging_args), class: "pointer-list"
@@ -85,6 +95,21 @@ format :html do
                multiple: true, class: "pointer-multiselect form-control"
   end
 
+  def add_item_modal_link
+    modal_link "Add Item",
+               size: :large,
+               class: "btn btn-sm btn-primary _add-item-link",
+               path: { view: :filter_items_modal,
+                       item: implicit_item_view,
+                       filter_card: filter_card.name,
+                       slot_selector: filtered_list_slot_class,
+                       item_selector: "_filtered-list-item",
+                       slot: { hide: :modal_footer },
+                       filter: { not_ids: card.item_ids.map(&:to_s).join(",") } }
+  end
+
+  def add_item_overlay_link; end
+
   private
 
   # currently only used by :list and :autocomplete. could be generalized?

data/mod/pointer/set/abstract/02_pointer/html_views/filter.rb

@@ -3,19 +3,34 @@ format :html do
     filtered_list_input
   end
 
-  view :filter_items, tags: :unknown_ok, cache: :never do
-    wrap { haml :filter_items }
+  view :filter_items_modal, tags: :unknown_ok, cache: :never, wrap: :modal do
+    render_filter_items
+  end
+
+  view :filter_items, tags: :unknown_ok, cache: :never, wrap: :slot  do
+    haml :filter_items
   end
 
   def filtered_list_input
     with_nest_mode :normal do
       class_up "card-slot", filtered_list_slot_class
-      wrap do
-        haml :filtered_list_input
+      with_class_up "card-slot", filtered_list_slot_class do
+        wrap do
+          haml :filtered_list_input
+        end
       end
     end
   end
 
+  def add_selected_link
+    link_to "Add Selected",
+            path: { item: params[:item], filter_card: params[:filter_card] },
+            class: "_add-selected slotter _close-modal btn btn-primary disabled",
+            data: { "slot-selector": ".#{params[:slot_selector]}",
+                    "item-selector": ".#{params[:item_selector]}",
+                    remote: true }
+  end
+
   def filtered_list_item item_card
     nest_item item_card do |rendered, item_view|
       wrap_item rendered, item_view
@@ -31,6 +46,7 @@ format :html do
   def default_filter_card
     fcard = card.options_rule_card || Card[:all]
     return fcard if fcard.respond_to? :wql_hash
+
     fcard.fetch trait: :referred_to_by, new: {}
   end
 

data/mod/pointer/set/abstract/02_pointer/html_views/filter/filter_items.haml

@@ -27,9 +27,4 @@
       .form-group
         .selected-item-buttons.pl-3
           = button_tag "Cancel", class: "cancel-modal", data: { dismiss: :modal }
-          = link_to "Add Selected", path: { item: params[:item],
-                                            filter_card: params[:filter_card] },
-                                    class: "_add-selected slotter close-modal btn btn-primary disabled",
-                                    data: { "slot-selector": ".#{params[:slot_selector]}",
-                                            "item-selector": ".#{params[:item_selector]}",
-                                            remote: true }
+          = add_selected_link

data/mod/pointer/set/abstract/02_pointer/html_views/filter/filtered_list_input.haml

@@ -1,5 +1,5 @@
 %div.filtered-list-editor
-  %ul.filtered-list-review._pointer-filtered-list.list-group.vertical.nopadding
+  %ul.pointer-list.filtered-list-review._pointer-filtered-list.list-group.vertical.nopadding
     - card.item_cards(context: :raw).each do |item_card|
       %li._filtered-list-item.clearfix{ data: item_card.format.wrap_data(false) }
         %span._handle.float-left.m-2
@@ -12,18 +12,9 @@
             = icon_tag :remove
   %br
   .clearfix
-    = modal_link "Add Item",
-                 path: { view: :filter_items,
-                         item: implicit_item_view,
-                         filter_card: filter_card.name,
-                         layout: :simple_modal,
-                         slot_selector: filtered_list_slot_class,
-                         item_selector: "_filtered-list-item",
-                         slot: { hide: :modal_footer },
-                         filter: { not_ids: card.item_ids.map(&:to_s).join(",") } },
-                 class: "btn btn-sm btn-primary _add-item-link",
-                 "data-target": "#modal-filtered-list"
-= modal_slot "filtered-list", "modal-lg"
+    = add_item_modal_link
+-# "data-target": "#modal-filtered-list"
+-# = modal_slot "filtered-list", "modal-lg"
 
 // note: passing item and filter card because in some cases (eg Project+Metric on wikirate)
 // the link was losing set-identifying information (type of left)

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

@@ -1 +1,10 @@
 include_set Abstract::Pointer
+
+format :html do
+  view :overview do
+    %i[mini_bar bar box closed titled labeled].map do |view|
+      voo.items[:view] = view
+      wrap_with :p, [content_tag(:h3, "#{view} items"), render_content]
+    end
+  end
+end

data/mod/pointer/spec/set/abstract/pointer/events_spec.rb

@@ -82,5 +82,11 @@ describe Card::Set::Abstract::Pointer do
                               content: ["b1", "[[b2]]"]
       expect(pointer1.content).to eq("[[b1]]\n[[b2]]")
     end
+
+    it "handles arrays for subfields" do
+      create "super card", subfields: { "a pointer" => { content: ["b1", "[[b2]]"],
+                                                         type_id: Card::PointerID } }
+      expect_card("super card+a pointer").to have_db_content "[[b1]]\n[[b2]]"
+    end
   end
 end

data/mod/rules/lib/javascript/script_rules.js.coffee

@@ -0,0 +1,23 @@
+$(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('attention')
+      $(this).notify 'To what Set does this Rule apply?'
+      false

data/mod/rules/set/rstar/rule_user.rb

@@ -0,0 +1,8 @@
+
+def rule_user_name
+  is_preference? ? name.trunk_name.tag : nil
+end
+
+def rule_user
+  is_preference? ? self[-2] : nil
+end

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

@@ -0,0 +1,32 @@
+format :html do
+  view :overlay_rule, cache: :never, tags: :unknown_ok do
+    wrap_with_overlay slot: breadcrumb_data("Rule editing", "rules") do
+      current_rule_form
+    end
+  end
+
+  view :modal_rule, cache: :never, tags: :unknown_ok, wrap: :modal do
+    current_rule_form
+  end
+
+  view :overlay_title do
+    edit_rule_title
+  end
+
+  view :overlay_rule_help, tags: :unknown_ok, perms: :none, cache: :never do
+    # wrap_with :div, class: "help-text rule-instruction d-flex justify-content-between"
+    # do
+
+    # output [wrap_with(:div, rule_based_help), setting_link]
+    # end
+    popover_link([rule_based_help, setting_link].join(" "))
+  end
+
+  def setting_link
+    wrap_with :div, class: "ml-auto" do
+      # FIXME: hardcoded count
+      link_to_card card.rule_setting_name, " (37 #{card.rule_setting_title} rules)",
+                   class: "text-muted", target: "wagn_setting"
+    end
+  end
+end

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

@@ -0,0 +1,144 @@
+format :html do
+  attr_accessor :rule_context
+
+  def current_rule force_reload=true
+    @current_rule = nil if force_reload
+    @current_rule ||= begin
+      rule = determine_current_rule
+      reload_rule rule
+    end
+  end
+
+  def determine_current_rule
+    existing = find_existing_rule_card
+    return existing if existing
+
+    Card.new name: "#{Card[:all].name}+#{card.rule_user_setting_name}"
+  end
+
+  view :rule_help, tags: :unknown_ok, perms: :none, cache: :never do
+    wrap_with :div, class: "alert alert-info rule-instruction" do
+      rule_based_help
+    end
+  end
+
+  view :show_rule, cache: :never, tags: :unknown_ok do
+    return "No Current Rule" if card.new_card?
+
+    voo.items[:view] ||= :link
+    output [
+      show_rule_set(card.rule_set),
+      _render_core
+    ]
+  end
+
+  def show_rule_set set
+    wrap_with :div, class: "rule-set" do
+      %(<label>Applies to</label> #{link_to_card set.name, set.label}:)
+    end
+  end
+
+  view :rule_bridge_link, tags: :unknown_ok do
+    opts = bridge_link_opts(class: "edit-rule-link nav-link",
+                            "data-toggle": "pill",
+                            "data-cy": "#{setting_title.to_name.key}-pill")
+    opts[:path].delete(:layout)
+    link_to_view(:overlay_rule, (setting_title + short_help_text), opts)
+  end
+
+  def setting_title
+    card.name.tag.tr "*", ""
+  end
+
+  def short_help_text
+    "<div class=\"help-text\">#{card.short_help_text}</div>"
+  end
+
+  def rule_content_container
+    wrap_with :div, class: "rule-content-container" do
+      wrap_with(:span, class: "closed-content content") { yield }
+    end
+  end
+
+  def link_to_open_rule
+    setting_title = card.name.tag.tr "*", ""
+    link_to_view :open_rule, setting_title, class: "edit-rule-link"
+  end
+
+  def closed_rule_content rule_card
+    return "" unless rule_card
+
+    nest rule_card, { view: :closed_content }, set_context: card.name.trunk_name
+  end
+
+  def open_rule_setting_links
+    wrap_with :div, class: "rule-setting" do
+      [link_to_closed_rule, link_to_all_rules]
+    end
+  end
+
+  def link_to_all_rules
+    link_to_card card.rule_setting_name, "all #{card.rule_setting_title} rules",
+                 class: "setting-link", target: "wagn_setting"
+  end
+
+  def link_to_closed_rule
+    link_to_view :closed_rule, card.rule_setting_title,
+                 class: "close-rule-link"
+  end
+
+  def reload_rule rule
+    return rule unless (card_args = params[:card])
+
+    if card_args[:name] && card_args[:name].to_name.key != rule.key
+      Card.new card_args
+    else
+      rule = rule.refresh
+      rule.assign_attributes card_args
+      rule.include_set_modules
+    end
+  end
+
+  def rule_set_description
+    card.rule_set.follow_label
+  end
+
+  def rules_type_formgroup
+    return unless card.right.rule_type_editable
+
+    success = @edit_rule_success
+    wrap_type_formgroup do
+      type_field(
+        href: path(mark: success[:id], view: success[:view], type_reload: true),
+        class: "type-field rule-type-field live-type-field",
+        "data-remote" => true
+      )
+    end
+  end
+
+  def rule_content_formgroup
+    formgroup "content", editor: "content", help: false do
+      content_field true
+    end
+  end
+
+  def current_set_key
+    card.new_card? ? Card.quick_fetch(:all).name.key : card.rule_set_key
+  end
+
+  private
+
+  def find_existing_rule_card
+    # self.card is a POTENTIAL rule; it quacks like a rule but may or may not
+    # exist.
+    # This generates a prototypical member of the POTENTIAL rule's set
+    # and returns that member's ACTUAL rule for the POTENTIAL rule's setting
+    if card.new_card?
+      if (setting = card.right)
+        card.set_prototype.rule_card setting.codename, user: card.rule_user
+      end
+    else
+      card
+    end
+  end
+end