card 1.101.1 → 1.101.6

data/tmpsets/set/{mod012-card-mod-edit → mod011-card-mod-edit}/all/edit_type.rb

@@ -49,61 +49,80 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
     end
   end
 
+  def type_field args={}
+    @no_current_type = args.delete :no_current_type # just a test artifact?
+    action_view.select_tag "card[type]", type_field_options,
+                           args.merge("data-select2-id": "#{unique_id}-#{Time.now.to_i}")
+  end
+
+  private
+
+  def raw_type_options
+    return @raw_type_options if @raw_type_options
+
+    options = Auth.createable_types
+    if !@no_current_type && card.real? && !options.include?(card.type_name)
+      # current type should be an option on existing cards,
+      # regardless of create perms
+      options.push(card.type_name).sort!
+    end
+    @raw_type_options = ::Set.new options
+  end
+
   def wrap_type_formgroup
     formgroup "Type", input: "type", class: "type-formgroup", help: false do
       output [yield, hidden_field_tag(:assign, true)]
     end
   end
 
-  def type_field args={}
-    typelist = Auth.createable_types
-    current_type = type_field_current_value args, typelist
-    action_view.select_tag "card[type]", type_field_options(current_type),
-                           args.merge("data-select2-id": "#{unique_id}-#{Time.now.to_i}")
+  def type_field_options
+    if grouped_types.size == 1
+      simple_type_field_options
+    else
+      multi_type_field_options
+    end
   end
 
-  def type_field_options current_type
-    types = grouped_types(current_type)
+  def simple_type_field_options
+    options_for_select grouped_types.flatten[1], current_type_value
+  end
 
-    if types.size == 1
-      options_for_select types.flatten[1], current_type
-    else
-      grouped_options_for_select types, current_type
-    end
+  def multi_type_field_options
+    grouped_options_for_select grouped_types, current_type_value
+  end
+
+  def current_type_value
+    return if @no_current_type
+
+    @current_type_value ||= card.type_name_or_default
   end
 
-  def grouped_types current_type
+  def grouped_types
     groups = Hash.new { |h, k| h[k] = [] }
-    allowed = ::Set.new Auth.createable_types
-    allowed << current_type if current_type
 
-    visible_cardtype_groups.each_pair do |name, items|
+    visible_cardtype_groups.each_pair.with_object(groups) do |(name, items), grps|
       if name == "Custom"
-        Auth.createable_types.each do |type|
-          groups["Custom"] << type unless ::Card::Set::Self::Cardtype::GROUP_MAP[type]
-        end
+        custom_grouped_types grps
       else
-        items.each do |i|
-          groups[name] << i if allowed.include?(i)
-        end
+        standard_grouped_types grps, name, items
       end
     end
-    groups
   end
 
-  def visible_cardtype_groups
-    ::Card::Set::Self::Cardtype::GROUP
+  def custom_grouped_types groups
+    Auth.createable_types.each do |type|
+      groups["Custom"] << type unless ::Card::Set::Self::Cardtype::GROUP_MAP[type]
+    end
   end
 
-  def type_field_current_value args, typelist
-    return if args.delete :no_current_type
-
-    if !card.new_card? && !typelist.include?(card.type_name)
-      # current type should be an option on existing cards,
-      # regardless of create perms
-      typelist.push(card.type_name).sort!
+  def standard_grouped_types groups, name, items
+    items.each do |i|
+      groups[name] << i if raw_type_options.include?(i)
     end
-    card.type_name_or_default
+  end
+
+  def visible_cardtype_groups
+    ::Card::Set::Self::Cardtype::GROUP
   end
 end
 end;end;end;end;

data/tmpsets/set/{mod012-card-mod-edit → mod011-card-mod-edit}/all/editor.rb

@@ -5,7 +5,6 @@ class Card; module Set; class All
 module Editor;
 extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card-mod-edit/set/all/editor.rb"; end
-
 Self::InputOptions.add_to_basket :options, "text area"
 Self::InputOptions.add_to_basket :options, "text field"
 
@@ -31,9 +30,8 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
 
   # move somewhere more accessible?
   def with_card mark
-    return nil unless (card = Card[mark])
-
-    yield card
+    card = Card[mark]
+    yield card if card
   rescue Card::Error::CodenameNotFound
     nil
   end
@@ -54,7 +52,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
 
   def text_area_input
     text_area :content, rows: 5, class: "d0-card-content",
-                        "data-card-type-code" => card.type_code
+                        "data-card-type-code": card.type_code
   end
 
   def text_field_input

data/tmpsets/set/{mod012-card-mod-edit → mod011-card-mod-edit}/all/form.rb

@@ -37,15 +37,13 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
     hidden_field :last_action_id_before_edit, class: "current_revision_id"
   end
 
-  def wrap_content_formgroup
+  def wrap_content_formgroup &block
     formgroup("Content", input: :content, help: false,
-                         class: classy("card-editor")) { yield }
+                         class: classy("card-editor"), &block)
   end
 
-  def button_formgroup
-    wrap_with :div, class: classy("form-group") do
-      wrap_with :div, yield
-    end
+  def button_formgroup &block
+    wrap_with :div, class: "form-group #{classy 'button-form-group'}", &block
   end
 
   def name_field
@@ -221,9 +219,16 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
     add_class opts, "card-form"
     add_class opts, "slotter" unless opts[:redirect] || opts[:no_slotter]
     add_class opts, "autosave" if action == :update
+    interpret_main_success_opts opts
     opts
   end
 
+  def interpret_main_success_opts opts
+    return unless (hash = opts.delete :main_success)
+
+    opts["data-main-success"] = JSON hash
+  end
+
   def card_form_url_and_action action
     case action
     when Symbol then [path(action: action), action]
@@ -234,18 +239,16 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
     end
   end
 
-  def editor_wrap type=nil
+  def editor_wrap type=nil, &block
     html_class = "editor"
     html_class << " #{type}-editor" if type
-    wrap_with :div, class: html_class do
-      yield
-    end
+    wrap_with :div, class: html_class, &block
   end
 
   # FIELD VIEWS
 
   def add_junction_class
-    return unless card.name.junction?
+    return unless card.name.compound?
 
     class_up "card-editor", "RIGHT-#{card.name.tag_name.safe_key}"
   end

data/tmpsets/set/{mod012-card-mod-edit → mod011-card-mod-edit}/all/form_buttons.rb

@@ -12,6 +12,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
 
   def standard_save_button opts={}
     return if voo&.hide?(:save_button)
+
     add_class opts, "submit-button btn-sm mr-3 _update-history-pills"
     opts[:text] ||= "Save"
     opts["data-cy"] = "save"
@@ -49,6 +50,8 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
   end
 
   def delete_button opts={}
+    return unless card.real?
+
     link_to "Delete", delete_button_opts(opts)
   end
 
@@ -56,7 +59,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
     add_class opts,  "slotter btn btn-outline-danger ml-auto btn-sm"
     opts["data-confirm"] = delete_confirm opts
     opts[:path] = { action: :delete }
-    opts[:path][:success] = delete_success(opts) unless opts.delete(:no_success)
+    opts[:path][:success] = delete_success(opts)
     opts[:remote] = true
     opts
   end
@@ -66,7 +69,13 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
   end
 
   def delete_success opts
-    opts.delete(:success) || (main? ? "REDIRECT: *previous" : { view: :just_deleted })
+    if opts[:success]
+      opts.delete :success
+    elsif main?
+      { redirect: true, mark: "*previous" }
+    else
+      { view: :just_deleted }
+    end
   end
 end
 end;end;end;end;

data/tmpsets/set/{mod012-card-mod-edit → mod011-card-mod-edit}/all/form_elements.rb

@@ -59,6 +59,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
   # redirect to *previous if no :href is given
   def cancel_button args={}
     return unless voo.show? :cancel_button
+
     text = args.delete(:text) || "Cancel"
     add_class args, "btn btn-#{args.delete(:situation) || 'secondary'}"
     add_class args, cancel_strategy(args[:redirect], args[:href])

data/tmpsets/set/{mod012-card-mod-edit → mod011-card-mod-edit}/all/new.rb

@@ -82,7 +82,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
   end
 
   def new_form_opts
-    { "main-success" => "REDIRECT" }
+    { "data-main-success": JSON(redirect: true) }
   end
 
   def new_view_title
@@ -97,7 +97,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
   end
 
   def new_success
-    card.rule(:thanks) || "_self"
+    { mark: (card.rule(:thanks) || "_self") }
   end
 
   def new_in_modal_success; end

data/tmpsets/set/{mod013-card-mod-history → mod012-card-mod-history}/all/history.rb

@@ -8,6 +8,7 @@ def self.source_location; "/Users/ethan/dev/decko/gem/card-mod-history/set/all/h
 event :update_ancestor_timestamps, :integrate do
   ids = history_ancestor_ids
   return unless ids.present?
+
   Card.where(id: ids).update_all(updater_id: Auth.current_id, updated_at: Time.now)
   ids.map { |anc_id| Card.expire anc_id.cardname }
 end
@@ -31,7 +32,7 @@ def history_ancestor_ids recursion_level=0
   return [] if recursion_level > 5
 
   ids = history_parent_ids +
-    history_parent_ids.map { |id| Card[id].history_ancestor_ids(recursion_level + 1) }
+        history_parent_ids.map { |id| Card[id].history_ancestor_ids(recursion_level + 1) }
   ids.flatten
 end
 

data/tmpsets/set/{mod013-card-mod-history → mod012-card-mod-history}/all/history/act_listing.rb

@@ -5,8 +5,6 @@ class Card; module Set; class All; module History;
 module ActListing;
 extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card-mod-history/set/all/history/act_listing.rb"; end
-ACTS_PER_PAGE = Card.config.acts_per_page
-
 module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFormat, self; extend Card::Set::AbstractFormat
   def act_from_context
     if (act_id = params["act_id"])
@@ -86,7 +84,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
   end
 
   def acts_per_page
-    @acts_per_page || ACTS_PER_PAGE
+    @acts_per_page ||= Card.config.acts_per_page || 10
   end
 
   def acts_page_from_params
@@ -94,11 +92,16 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
   end
 
   def act_paging acts, context
+    return unless controller.request # paginate requires a request
+
     wrap_with :div, class: "slotter btn-sm" do
-      acts = current_page_acts acts
-      opts = { remote: true, theme: "twitter-bootstrap-4" }
+      paginate current_page_acts(acts), act_paging_opts(context)
+    end
+  end
+
+  def act_paging_opts context
+    { remote: true, theme: "twitter-bootstrap-4" }.tap do |opts|
       opts[:total_pages] = 10 if limited_paging? context
-      paginate acts, opts
     end
   end
 

data/tmpsets/set/{mod013-card-mod-history → mod012-card-mod-history}/all/history/actions.rb

@@ -14,12 +14,16 @@ end
 def action_from_id action_id
   return unless action_id.is_a?(Integer) || action_id =~ /^\d+$/
 
-  # if not an integer revision id is probably a mod (e.g. if you request
+  # if not an integer, action_id is probably a mod (e.g. if you request
   # files/:logo/standard.png)
-  action = Action.fetch action_id
-  return unless action.card_id == id
 
-  action
+  action_if_on_self Action.fetch(action_id)
+end
+
+def action_if_on_self action
+  return unless action.is_a? Action
+
+  action if action.card_id == id
 end
 
 def old_actions

data/tmpsets/set/{mod013-card-mod-history → mod012-card-mod-history}/all/history/events.rb

@@ -25,7 +25,7 @@ def actionable?
 end
 
 event :detect_conflict, :validate, on: :update, when: :edit_conflict? do
-  errors.add :conflict, tr(:error_not_latest_revision)
+  errors.add :conflict, Cardio.t(:history_error_not_latest_revision)
 end
 
 def edit_conflict?
@@ -41,7 +41,7 @@ event :finalize_action, :finalize, when: :finalize_action? do
   if changed_fields.present?
     @current_action.update! card_id: id
 
-    # Note: #last_change_on uses the id to sort by date
+    # NOTE: #last_change_on uses the id to sort by date
     # so the changes for the create changes have to be created before the first change
     store_card_changes_for_create_action if first_change?
     store_card_changes unless first_create?
@@ -71,7 +71,7 @@ def store_each_history_field action_id, fields=nil
   if false # Card::Change.supports_import?
     # attach.feature fails with this
     values = fields.map.with_index { |field, index| [index, yield(field), action_id] }
-    Card::Change.import [:field, :value, :card_action_id], values #, validate: false
+    Card::Change.import %i[field value card_action_id], values # , validate: false
   else
     fields.each do |field|
       Card::Change.create field: field,

data/tmpsets/set/{mod013-card-mod-history → mod012-card-mod-history}/all/history/selected.rb

@@ -31,7 +31,7 @@ def select_action action_id
 end
 
 def selected_action_id
-  @selected_action_id || (@current_action&.id) || last_action_id
+  @selected_action_id || @current_action&.id || last_action_id
 end
 
 def selected_action_id= action_id
@@ -48,8 +48,8 @@ def selected_content
 end
 
 def content_at_time_of_selected_action
-  lc = last_change_on(:db_content, not_after: @selected_action_id, including_drafts: true)
-  lc&.value
+  last_change_on(:db_content, not_after: selected_action_id,
+                              including_drafts: true)&.value
 end
 
 def with_selected_action_id action_id

data/tmpsets/set/{mod013-card-mod-history → mod012-card-mod-history}/all/history/views.rb

@@ -39,6 +39,37 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
   view :action_expanded do
     action_content action_from_context, :expanded
   end
+
+  view :change do
+    voo.show :title_link
+    voo.hide :menu
+    wrap do
+      [_render_title,
+       _render_menu,
+       _render_last_action]
+    end
+  end
+
+  view :last_action do
+    %(
+      <span class="last-update">
+        #{render_last_action_verb} #{render_acted_at} ago by
+        #{nest card.last_actor, view: :link}
+      </span>
+    )
+  end
+
+  view :last_action_verb, cache: :never do
+    return unless (act = card.last_act)
+    return unless (action = act.action_on card.id)
+
+    case action.action_type
+    when :create then "added"
+    when :delete then "deleted"
+    else
+      link_to_view :history, "edited", class: "last-edited", rel: "nofollow"
+    end
+  end
 end
 end;end;end;end;end;
 # ~~ generated from /Users/ethan/dev/decko/gem/card-mod-history/set/all/history/views.rb ~~