five-two-nw-olivander 0.1.2.51 → 0.1.2.52

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfc8a78839ba441c4f7f1588122feb30fafb585ded19b0b1d5fe663d7cb52ad7
-  data.tar.gz: 0e8ad124a7cb6bf71446abe40cdb747c2feef9092bf8ef5b7616528f45a36317
+  metadata.gz: 2e93303d3b518b3409a10ca1d3ca08da710bbfee02e520c25dbca2fd14ff30f2
+  data.tar.gz: 803fc57772644b7ae0205e9c8df64d2fbba922e094ca53066916292b2bb8ca56
 SHA512:
-  metadata.gz: 380be235b65bc45652b82f8f05beda410256fe16ebdb00fb17824952fc7ee7aafd90b731b52ea974bbb706b2b63d7e830e3710b301e14e38f95d5c943fe535ad
-  data.tar.gz: c65a9b8f7fa4324f7ea1df8035dba342799e4e38310ebe04c644d0ff908a6850f8d15ed204e78359c16fee8e401e94fb5a0340b83bc69e8932910c7f96d8cdb6
+  metadata.gz: a931367c49c1001c860e979276c0d2e96a6cba7614ab1edd172d2e5306f01a005407aa3a6fac3493f640a113dc07bd0e6757e2a072e9430c209b3437c7d5076d
+  data.tar.gz: d2a97766f50abb22ca3947fe6eff851b7c443d3ef8d2397a4b8ed0400eb370d3756b1c4eb1ac72dc5ba36b678d6274f792464f5d0f25162169d8e1e8319c23b0

data/app/controllers/concerns/olivander/resources/route_builder.rb

@@ -3,10 +3,12 @@ module Olivander
     class ResourceAction
       attr_accessor :sym, :action, :verb, :confirm, :turbo_frame, :collection,
                     :controller, :crud_action, :show_in_form, :show_in_datatable,
-                    :no_route, :path_helper
+                    :no_route, :path_helper, :confirm_with
 
-      def initialize(sym, action: nil, controller: nil, verb: :get, confirm: false, turbo_frame: nil, collection: false, crud_action: false,
-                     show_in_form: true, show_in_datatable: true, no_route: false, path_helper: nil)
+      def initialize(sym, action: nil, controller: nil, verb: :get, confirm: false,
+                     turbo_frame: nil, collection: false, crud_action: false,
+                     show_in_form: true, show_in_datatable: true, no_route: false,
+                     path_helper: nil, confirm_with: nil)
         self.sym = sym
         self.action = action || sym
         self.controller = controller
@@ -19,6 +21,35 @@ module Olivander
         self.show_in_datatable = show_in_datatable
         self.no_route = no_route
         self.path_helper = path_helper
+        self.confirm_with = confirm_with
+      end
+
+      def args_hash(options = nil)
+        {}.tap do |h|
+          h.merge!(method: verb) if turbo_frame.blank?
+          h.merge!(data: data_hash)
+          h.merge!(options) if options.present?
+        end
+      end
+
+      def data_hash
+        {}.tap do |h|
+          h.merge!(turbo: true, turbo_method: verb, turbo_frame: turbo_frame) if turbo_frame.present?
+
+          message = confirmation_message
+          h.merge!(confirm_key => message) unless message.blank?
+        end
+      end
+
+      def confirm_key
+        turbo_frame.present? ? :turbo_confirm : :confirm
+      end
+
+      def confirmation_message
+        return confirm_with if confirm_with.present?
+        return I18n.t('activerecord.actions.delete-confirmation') if verb == :delete
+
+        nil
       end
     end
 
@@ -99,13 +130,16 @@ module Olivander
         end
 
         def action(sym, verb: :get, confirm: false, turbo_frame: nil, collection: false, show_in_datatable: true,
-                   show_in_form: true, no_route: false, controller: nil, action: nil, path_helper: nil)
+                   show_in_form: true, no_route: false, controller: nil, action: nil, path_helper: nil,
+                   confirm_with: nil
+                  )
           raise 'Must be invoked in a resource block' unless current_resource.present?
 
           controller ||= current_resource.model
           current_resource.actions << ResourceAction.new(
             sym, action: action, controller: controller, verb: verb, confirm: confirm, turbo_frame: turbo_frame, collection: collection,
-            show_in_datatable: show_in_datatable, show_in_form: show_in_form, no_route: no_route, path_helper: path_helper
+            show_in_datatable: show_in_datatable, show_in_form: show_in_form, no_route: no_route, path_helper: path_helper,
+            confirm_with: confirm_with
           )
         end
 

data/app/views/application/_resource_form_actions.html.haml

@@ -7,10 +7,6 @@
         %i.fa{ class: I18n.t(icon_key)}
       = resource_form_action_label(@resource, a.sym)
 
-    - if a.turbo_frame.blank?
-      = link_to({ controller: a.controller, action: a.action }, method: a.verb, class: 'btn btn-tool') do
-        = yield cf_sym
-    - else
-      = link_to({ controller: a.controller, action: a.action }, class: 'btn btn-tool', data: { turbo: true, turbo_method: a.verb, turbo_frame: a.turbo_frame }) do
-        = yield cf_sym
+    = link_to({ controller: a.controller, action: a.action }, a.args_hash(class: 'btn btn-tool')) do
+      = yield cf_sym
      

data/app/views/effective/resource/_actions_dropleft.html.haml

@@ -19,8 +19,7 @@
             = dropdown_link_to resource_form_action_label(resource, a.sym), path, data: data, method: a.verb
   - crud_actions.each do |a|
     - path = a.path_helper.is_a?(Proc) ? a.path_helper.call(resource) : send(a.path_helper, resource.id)
-    - data = a.turbo_frame.present? ? { turbo: true, turbo_frame: a.turbo_frame } : {}
     - icon_class = (a.verb == :delete ? '' : '')
-    = link_to path, data: data, method: a.verb, title: resource_form_action_label(resource, a.sym), class: "btn btn-sm #{icon_class}" do
+    = link_to path, a.args_hash(title: resource_form_action_label(resource, a.sym), class: "btn btn-sm #{icon_class}") do
       %i{ class: resource_form_action_icon(resource, a.sym), style: 'display: block; font-size: 10px' }
       %span{ style: 'font-size: 12px' }= resource_form_action_label(resource, a.sym)

data/lib/olivander/version.rb

@@ -1,3 +1,3 @@
 module Olivander
-  VERSION = '0.1.2.51'.freeze
+  VERSION = '0.1.2.52'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: five-two-nw-olivander
 version: !ruby/object:Gem::Version
-  version: 0.1.2.51
+  version: 0.1.2.52
 platform: ruby
 authors:
 - Eric Dennis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-29 00:00:00.000000000 Z
+date: 2024-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chartkick