card-mod-edit 0.1 → 0.11.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7bdfc901290eeb41d413810325770cbb1a84550f5904ac31f040199bb6ea867
-  data.tar.gz: 2bc78ed7d0e52c36cb1780cdf094d42923c5cc8acaffcfd860895b09cdad6e42
+  metadata.gz: c4585a2392445ad135ba9d2ca3d5281ac157e60c985a13065ab40fe616833dd1
+  data.tar.gz: 411c89a8efe8b6340e712265a7b57b2b4a32d97cb4a3ce767a06f647baa74891
 SHA512:
-  metadata.gz: 837208fbdc76eabc11fc0994c0f6287266479d4e157ec7468eb6333bd628b897c11413a829c35d2bd44b68ce08f06365c9b63f38f717d9ae6695713c927d85cb
-  data.tar.gz: 1fd91ea28bfbdc343dbf7f240b102e32e6d0249531ed212643d07b9f2bfbce262d553c55bc278dd23f98a4f5475a5697c30bb48de67e18924f72815b4fde06e7
+  metadata.gz: 0b593eeb1dcd1c28e11154cf4a2d97708901d5fdaf087441e641767070c74061b9d39bc89368b5f37f82c9f0070070a33d88076ce2fb29d096a4998244769735
+  data.tar.gz: ae37bbd8b63506434029f7acb2627070912a0bf2211ecc0e63140ff2941c8801516dcdc7c6a300ce6d1e9167b6f10b5d01d7f51daf2f580a64cde0269b3b6e51

data/set/all/bridge.rb

@@ -1,11 +1,11 @@
-format :html do
-  BRIDGE_TABS = { "Account" => :account_tab,
-                  "Guide"   => :guide_tab,
-                  "Engage"  => :engage_tab,
-                  "History" => :history_tab,
-                  "Related" => :related_tab,
-                  "Rules"   => :rules_tab }.freeze
+BRIDGE_TABS = { "Account" => :account_tab,
+                "Guide"   => :guide_tab,
+                "Engage"  => :engage_tab,
+                "History" => :history_tab,
+                "Related" => :related_tab,
+                "Rules"   => :rules_tab }.freeze
 
+format :html do
   wrapper :bridge do
     class_up "modal-dialog", "no-gaps"
     voo.hide! :modal_footer

data/set/all/bridge/tab_visibility.rb

@@ -1,6 +1,6 @@
 format :html do
   def visible_bridge_tabs
-    BRIDGE_TABS.select do |_title, view|
+    Bridge::BRIDGE_TABS.select do |_title, view|
       send "show_#{view}?"
     end
   end
@@ -34,11 +34,9 @@ format :html do
   end
 
   def show_discussion?
-    d_card = discussion_card
-    return unless d_card
+    return unless (d_card = discussion_card)
 
-    permission_task = d_card.new_card? ? :update : :read
-    d_card.ok? permission_task
+    d_card.ok? discussion_permission_task(d_card)
   end
 
   def discussion_card?
@@ -50,4 +48,11 @@ format :html do
 
     card.fetch :discussion, skip_modules: true, new: {}
   end
+
+  private
+
+  def discussion_permission_task d_card=nil
+    d_card ||= discussion_card
+    d_card.new_card? ? :update : :read
+  end
 end

data/set/all/edit_name.rb

@@ -11,7 +11,7 @@ format :html do
 
   def name_form success_view=nil
     card_form({ action: :update, id: card.id },
-              # "main-success" => "REDIRECT",
+              "data-main-success": JSON(redirect: true, view: ""),
               "data-update-origin": "true",
               success: edit_name_success(success_view)) do
       [hidden_edit_name_fields,
@@ -22,7 +22,7 @@ format :html do
   end
 
   def edit_name_success view=nil
-    success = { id: "_self" }
+    success = { name: "_self", redirect: "" }
     success[:view] = view if view
     success
   end

data/set/all/edit_type.rb

@@ -42,60 +42,78 @@ format :html do
     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
-    template.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

data/set/all/editor.rb

@@ -24,9 +24,8 @@ format :html do
 
   # 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

data/set/all/form.rb

@@ -214,9 +214,16 @@ format :html do
     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]

data/set/all/form_buttons.rb

@@ -42,6 +42,8 @@ format :html do
   end
 
   def delete_button opts={}
+    return unless card.real?
+
     link_to "Delete", delete_button_opts(opts)
   end
 
@@ -49,7 +51,7 @@ format :html do
     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
@@ -59,6 +61,12 @@ format :html do
   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

data/set/all/new.rb

@@ -1,4 +1,6 @@
 format :html do
+  delegate :autoname?, to: :card
+
   view :new, perms: :create, unknown: true, cache: :never do
     new_view_frame_and_form new_form_opts
   end
@@ -73,7 +75,7 @@ format :html do
   end
 
   def new_form_opts
-    { "main-success" => "REDIRECT" }
+    { "data-main-success": JSON(redirect: true) }
   end
 
   def new_view_title
@@ -88,7 +90,7 @@ format :html do
   end
 
   def new_success
-    card.rule(:thanks) || "_self"
+    { mark: (card.rule(:thanks) || "_self") }
   end
 
   def new_in_modal_success; end
@@ -114,10 +116,6 @@ format :html do
     end
   end
 
-  def autoname?
-    @autoname.nil? ? (@autoname = card.rule_card :autoname).present? : @autoname
-  end
-
   def needs_name?
     card.name.blank? && !autoname?
   end

data/set/right/input_type.rb

@@ -0,0 +1,35 @@
+format :html do
+  def quick_editor
+    @submit_on_change = true
+    super
+  end
+
+  def quick_form_opts
+    super.merge "data-update-foreign-slot":
+                ".card-slot.quick_edit-view.RIGHT-Xcontent_option_view"
+  end
+
+  def default_input_type
+    :radio
+  end
+
+  def raw_help_text
+    "edit interface for list cards"
+  end
+
+  # def option_label_text option_name
+  #   super.downcase
+  # end
+
+  def quick_edit
+    card.left.prototype_default_card.try(:show_input_type?) ? super : ""
+  end
+end
+
+def option_names
+  left.prototype_default_card&.try(:input_type_content_options) || super
+end
+
+def supports_content_option_view?
+  item_name.in? ["checkbox", "radio", "filtered list"]
+end

data/set/self/input_type.rb

@@ -0,0 +1,12 @@
+setting_opts group: :editing,
+             position: 3,
+             rule_type_editable: false,
+             short_help_text: "edit interface"
+
+format :html do
+  def raw_help_text
+    "Configure [[https://ace.c9.io/|ace]], "\
+    "Decko's default code editor, using these available "\
+    "[[https://github.com/ajaxorg/ace/wiki/Configuring-Ace|options]]."
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-edit
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: 0.11.4
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,8 +10,22 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-19 00:00:00.000000000 Z
-dependencies: []
+date: 2021-05-05 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: card
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.101.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.101.4
 description: ''
 email:
 - info@decko.org
@@ -40,14 +54,20 @@ files:
 - set/all/overlay_guide.haml
 - set/all/overlay_guide.rb
 - set/all/template_nest.rb
+- set/right/input_type.rb
+- set/self/input_type.rb
 - set/type/list.rb
 - set/type/plain_text.rb
 - set/type/pointer.rb
-homepage: http://decko.org
+homepage: https://decko.org
 licenses:
-- GPL-2.0
 - GPL-3.0
 metadata:
+  source_code_uri: https://github.com/decko-commons/decko
+  homepage_uri: https://decko.org
+  bug_tracker_uri: https://github.com/decko-commons/decko/issues
+  wiki_uri: https://decko.org
+  documentation_url: http://docs.decko.org/
   card-mod: edit
 post_install_message:
 rdoc_options: []
@@ -57,15 +77,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
-summary: Calendar editor
+summary: Edit handling
 test_files: []