card-mod-edit 0.13.4 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad39ba7845e2d7fd8394001d9125e7426e420a95ecf6c7823d7ff543f815dab1
-  data.tar.gz: 2cd4afb37e71c18dea734522a10ef27f93f92a3cd86c578b28f8950cfc4df2f9
+  metadata.gz: 171bd7cab880ed08678d825d73145ebf76423e6d11fbfd42bf3e236c24969cff
+  data.tar.gz: 27b1cb3244658743ccbd2f6efd07b7f84edf1db46a41c3a87050c338edb27b7f
 SHA512:
-  metadata.gz: cdd76b927bf903fc880861a4f12fa7a923b8e8f3e9d71cb2ed4c2c520d6b51a647646720cb1a83805bb22afaf262489e42671983e3ad7777b0cbf83675ec4c1c
-  data.tar.gz: a18cca0f8fe57f1c8ed00bfcb5bafb5d3029cd6083acf733b1fbfb4eb541edc915ebc3b98cfc558c16dbacbc009a4569b8e23754f7456bda775150ae8bc7d160
+  metadata.gz: 59e57dea79faaf966db928719062959af44c83eebf5405feef675faaa3c91763f61f261d9c524baf7d744baa0140c6345809f469d3927ce1318062474e50937d
+  data.tar.gz: aba8cb501a6037186d34e6e6dd506c341391f1100b7c100085281a9864a1db96a53b57c936e1568595db7bf02b94837df842871bdb80fc89903f27b637a01393

data/set/all/edit_content.rb

@@ -9,7 +9,7 @@ format :html do
   def edit_form
     voo.hide :edit_type_row
     form_opts = edit_form_opts.reverse_merge success: edit_success
-    card_form(:update, form_opts) do
+    card_form :update, form_opts do
       [
         edit_view_hidden,
         _render_edit_type_row(home_view: :edit_type_row),
@@ -20,7 +20,7 @@ format :html do
         # the slot wrap. Id think this would probably best be handled as an
         # option to #wrap that triggers a new heir voo
         _render_content_formgroups,
-        _render_edit_buttons
+        _render(voo.buttons_view || :edit_buttons)
       ]
     end
   end

data/set/all/edit_inline.rb

@@ -1,12 +1,13 @@
 format :html do
   view :edit_inline, perms: :update, unknown: true, cache: :never, wrap: :slot do
+    add_name_context
     voo.hide :name_formgroup, :type_formgroup
     with_nest_mode :edit do
       card_form :update, success: edit_success do
         [
           edit_view_hidden,
           _render_content_formgroups,
-          _render_edit_inline_buttons
+          _render(voo.buttons_view || :edit_inline_buttons)
         ]
       end
     end
@@ -18,9 +19,7 @@ format :html do
 
   view :edit_inline_buttons do
     button_formgroup do
-      wrap_with "div", class: "d-flex" do
-        [standard_save_button, cancel_in_place_button, delete_button]
-      end
+      [standard_save_button, cancel_in_place_button, delete_button]
     end
   end
 

data/set/all/edit_name.rb

@@ -12,7 +12,7 @@ format :html do
   def name_form success_view=nil
     card_form({ action: :update, id: card.id },
               { "data-main-success": JSON(redirect: true, view: ""),
-                "data-update-origin": "true",
+                "data-slotter-mode": "update-origin",
                 class: "_rename-form",
                 success: edit_name_success(success_view) }) do
       [_render_name_formgroup,

data/set/all/edit_type.rb

@@ -26,9 +26,8 @@ format :html do
                               view: :edit_form,
                               assign: true,
                               slot: { show: :type_form }),
-                   class: "live-type-field slotter",
-                   'data-remote': true,
-                   'data-slot-selector': ".card-slot.edit_form-view"
+                   class: "_live-type-field",
+                   'data-remote': true
   end
 
   view :type_formgroup do
@@ -95,19 +94,13 @@ format :html do
 
     visible_cardtype_groups.each_pair.with_object(groups) do |(name, items), grps|
       if name == "Custom"
-        custom_grouped_types grps
+        groups[name] = custom_types
       else
         standard_grouped_types grps, name, items
       end
     end
   end
 
-  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 standard_grouped_types groups, name, items
     items.each do |i|
       groups[name] << i if raw_type_options.include?(i)
@@ -115,6 +108,6 @@ format :html do
   end
 
   def visible_cardtype_groups
-    ::Card::Set::Self::Cardtype::GROUP
+    All::CardtypeGroups::GROUP
   end
 end

data/set/all/editing.rb

@@ -38,9 +38,7 @@ format :html do
 
   view :edit_buttons do
     button_formgroup do
-      wrap_with "div", class: "d-flex" do
-        [standard_submit_button, edit_cancel_button, delete_button]
-      end
+      [standard_submit_button, edit_cancel_button, delete_button]
     end
   end
 
@@ -82,7 +80,7 @@ format :html do
   #   frame do
   #     # with_nest_mode :edit do
   #     nested_fields.map do |name, _options|
-  #       nest Card.fetch(name.to_name.trait(:self)),
+  #       nest Card.fetch(name.to_name.field(:self)),
   #            view: :titled, title: name, rule_view: view,
   #            hide: :set_label, show: :rule_navbar
   #     end

data/set/all/form.rb

@@ -31,8 +31,8 @@ format :html do
   end
 
   def wrap_content_formgroup &block
-    formgroup("Content", input: :content, help: false,
-                         class: classy("card-editor"), &block)
+    formgroup "Content", input: :content, help: false,
+                         class: classy("card-editor"), &block
   end
 
   def button_formgroup &block

data/set/all/formgroup.rb

@@ -1,23 +1,31 @@
 format :html do
-  # a formgroup has a label, an input and help text
+  view :read_form do
+    edit_field_configs.map do |field, args|
+      args[:view] = :read_formgroup
+      nest field, args
+    end
+  end
+
+  view :read_formgroup, template: :haml, unknown: true, wrap: :slot
+
+  # a formgroup has a label (with helptext) and an input
   def formgroup title, opts={}, &block
+    input = opts[:input]
     wrap_with :div, formgroup_div_args(opts[:class]) do
-      formgroup_body title, opts, &block
+      [formgroup_label(input, title, opts[:help]),
+       editor_wrap(input, &block)]
     end
   end
 
-  def formgroup_body title, opts, &block
-    label = formgroup_label opts[:input], title
-    editor_body = editor_wrap opts[:input], &block
-    help_text = formgroup_help_text opts[:help]
-    "#{label}<div>#{help_text} #{editor_body}</div>"
-  end
+  def formgroup_label input, title, help
+    parts = [formgroup_title(title), formgroup_help(help)].compact
+    return unless parts.present?
 
-  def formgroup_label input, title
-    return if voo&.hide?(:title) || title.blank?
+    form.label (input || :content), raw(parts.join("\n"))
+  end
 
-    label_type = input || :content
-    form.label label_type, title
+  def formgroup_title title
+    title if voo&.show?(:title) && title.present?
   end
 
   def formgroup_div_args html_class
@@ -27,11 +35,15 @@ format :html do
     div_args
   end
 
-  def formgroup_help_text text=nil
-    return "" if text == false
+  def formgroup_help text=nil
+    return unless voo&.show?(:help) && text != false
 
     class_up "help-text", "help-block"
-    voo.help = text if voo && text.to_s != "true"
+    formgroup_voo_help text
     _render_help
   end
+
+  def formgroup_voo_help text
+    voo.help = text if voo && text.present? && text.to_s != "true"
+  end
 end

data/set/all/new.rb

@@ -2,30 +2,49 @@ 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
-
-  view :new_content_form, wrap: :slot, unknown: true, cache: :never do
-    with_nest_mode :edit do
-      create_form
-    end
+    framed_create_form new_form_opts
   end
 
   view :new_in_modal, perms: :create, unknown: true, cache: :never,
                       wrap: { modal: { footer: "", size: :edit_modal_size,
                                        title: :new_in_modal_title,
                                        menu: :new_modal_menu } } do
-    _render_new_content_form
+    voo.buttons_view ||= :new_in_modal_buttons
+    wrap do
+      create_form "data-slot-selector": "modal-origin",
+                  "data-slot-error-selector": ".card-slot"
+    end
+  end
+
+  view :simple_new, perms: :create, unknown: true, wrap: :slot, cache: :never do
+    create_form
   end
 
-  def create_form
-    form_opts = new_in_modal_form_opts.reverse_merge(success: new_in_modal_success)
-    buttons = form_opts.delete(:buttons) || _render_new_buttons
+  view :new_fields, perms: :create, unknown: true, cache: :never do
+    wrap true, class: "w-100" do
+      [
+        new_view_hidden,
+        new_view_name,
+        new_view_type,
+        _render_content_formgroups,
+        _render(voo.buttons_view || :new_buttons)
+      ]
+    end
+  end
+
+  def with_create_context
+    with_nest_mode :edit do
+      voo.title ||= new_view_title if new_name_prompt?
+      voo.show :help
+      yield
+    end
+  end
 
-    voo.title ||= new_view_title if new_name_prompt?
-    voo.show :help
-    card_form(:create, form_opts) do
-      create_form_with_alert_guide buttons
+  def create_form form_opts={}
+    with_create_context do
+      card_form :create, form_opts do
+        create_form_with_alert_guide
+      end
     end
   end
 
@@ -39,45 +58,27 @@ format :html do
     end
   end
 
-  def new_view_frame_and_form form_opts={}
-    buttons = form_opts.delete(:buttons) || _render_new_buttons
-    form_opts = form_opts.reverse_merge(success: new_success)
+  def framed_create_form form_opts={}
+    form_opts.reverse_merge! success: new_success
 
-    with_nest_mode :edit do
-      voo.title ||= new_view_title if new_name_prompt?
-      voo.show :help
+    with_create_context do
       frame_and_form :create, form_opts do
-        create_form_with_alert_guide buttons
+        create_form_with_alert_guide
       end
     end
   end
 
-  def create_form_with_alert_guide buttons
+  def create_form_with_alert_guide
     wrap_with :div, class: "d-flex justify-content-between" do
-      [(wrap_with(:div, class: "w-100") do
-        [
-          new_view_hidden,
-          new_view_name,
-          new_view_type,
-          _render_content_formgroups,
-          buttons
-        ]
-      end),
-       (alert_guide if voo.show?(:guide))]
+      [_render_new_fields, (alert_guide if voo.show?(:guide))]
     end
   end
 
-  def new_view_hidden; end
-
-  def new_in_modal_form_opts
-    { "data-slot-selector": "modal-origin", "data-slot-error-selector": ".card-slot",
-      buttons: _render_new_in_modal_buttons }
-  end
-
   def new_form_opts
     { "data-main-success": JSON(redirect: true) }
   end
 
+  # LOCALIZE
   def new_view_title
     output(
       "New",
@@ -95,6 +96,8 @@ format :html do
 
   def new_in_modal_success; end
 
+  def new_view_hidden; end
+
   # NAME HANDLING
 
   def new_view_name
@@ -150,34 +153,32 @@ format :html do
 
   view :new_type_formgroup do
     wrap_type_formgroup do
-      type_field class: "type-field live-type-field",
-                 href: path(view: :new),
+      type_field class: "type-field _live-type-field slotter",
+                 href: path(view: :new_fields),
                  "data-remote" => true
     end
   end
 
   view :new_buttons do
     button_formgroup do
-      [standard_create_button, standard_cancel_button(cancel_button_new_args)]
+      [standard_create_button, standard_cancel_button(href: cancel_create_path)]
     end
   end
 
   view :new_in_modal_buttons do
+    class_up "button-form-group", "d-flex"
     button_formgroup do
-      wrap_with "div", class: "d-flex" do
-        [standard_save_and_close_button(text: "Submit"), modal_cancel_button]
-      end
+      [standard_save_and_close_button(text: "Submit"), modal_cancel_button]
     end
   end
 
   # path to redirect to after canceling a new form
-  def cancel_button_new_args
-    href = case
-           when main?          then path_to_previous
-           when voo&.home_view then path(view: voo.home_view)
-           else                     path(view: :unknown)
-           end
-    { href: href }
+  def cancel_create_path
+    if main?
+      path_to_previous
+    else
+      path view: (voo&.home_view || :unknown)
+    end
   end
 
   def standard_create_button

data/set/all/read_formgroup.haml

@@ -0,0 +1,5 @@
+.form-group
+  %label
+    = render_title
+  .read-formgroup-content
+    = render_core

data/set/all/template_nest.rb

@@ -14,7 +14,7 @@ format do
   def template_link_set_name
     name = voo.nest_name.to_name
     if name.absolute?
-      name.trait_name :self
+      name.field_name :self
     else
       template_link_set_name_for_relative_name name
     end
@@ -24,9 +24,9 @@ format do
     name = name.stripped.gsub(/^\+/, "")
 
     if (type = on_type_set)
-      [type, name].to_name.trait_name :type_plus_right
+      [type, name].to_name.field_name :type_plus_right
     else
-      name.to_name.trait_name :right
+      name.to_name.field_name :right
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-edit
 version: !ruby/object:Gem::Version
-  version: 0.13.4
+  version: 0.14.0
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-24 00:00:00.000000000 Z
+date: 2021-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -18,14 +18,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.103.4
+        version: 1.104.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.103.4
+        version: 1.104.0
+- !ruby/object:Gem::Dependency
+  name: card-mod-rules
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.14.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.14.0
 description: ''
 email:
 - info@decko.org
@@ -43,7 +57,6 @@ files:
 - set/all/edit_content.rb
 - set/all/edit_inline.rb
 - set/all/edit_name.rb
-- set/all/edit_name_confirmation.haml
 - set/all/edit_name_skip_referers.haml
 - set/all/edit_type.rb
 - set/all/editing.rb
@@ -55,6 +68,7 @@ files:
 - set/all/new.rb
 - set/all/overlay_guide.haml
 - set/all/overlay_guide.rb
+- set/all/read_formgroup.haml
 - set/all/template_nest.rb
 - set/right/input_type.rb
 - set/self/input_type.rb
@@ -86,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: Edit handling

data/set/all/edit_name_confirmation.haml

@@ -1,7 +0,0 @@
-%h5
-  = t :core_rename_confirm
-  %em
-    = safe_name
-  ?
-%p._rename-reference-confirm{ data: { referer_count: referer_count } }
-  = t :core_rename_reference_confirm, count: referer_count