fix: action visibility on show controls

avo-hq · Jul 5, 2023 · e6cdc9f · e6cdc9f
1 parent 1cf596c
commit e6cdc9f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 14 deletions.
diff --git a/app/components/avo/views/resource_show_component.html.erb b/app/components/avo/views/resource_show_component.html.erb
@@ -55,17 +55,19 @@
               <% end %>
             <% end %>
           <% elsif control.action? %>
-            <%= a_link control.path,
-                color: control.color,
-                style: control.style,
-                icon: control.icon,
-                title: control.title,
-                data: {
-                  tippy: control.title ? :tooltip : nil,
-                  'turbo-frame': 'actions_show',
-                  'action': 'click->actions-picker#visitAction',
-                } do %>
-              <%= control.label %>
+            <% if control.action.visible_in_view(parent_resource: @parent_resource) %>
+              <%= a_link control.path,
+                  color: control.color,
+                  style: control.style,
+                  icon: control.icon,
+                  title: control.title,
+                  data: {
+                    tippy: control.title ? :tooltip : nil,
+                    'turbo-frame': 'actions_show',
+                    'action': 'click->actions-picker#visitAction',
+                  } do %>
+                <%= control.label %>
+              <% end %>
             <% end %>
           <% elsif control.link_to? %>
             <%= a_link control.path,

diff --git a/lib/avo/resources/controls/action.rb b/lib/avo/resources/controls/action.rb
@@ -4,17 +4,17 @@ module Controls
       class Action < BaseControl
         attr_reader :klass
 
-        def initialize(klass, model: nil, resource: nil, view: nil, **args)
+        def initialize(klass, record: nil, resource: nil, view: nil, **args)
           super(**args)
 
           @klass = klass
           @resource = resource
-          @model = model
+          @record = record
           @view = view
         end
 
         def action
-          @instance ||= @klass.new(model: @model, resource: @resource, view: @view)
+          @instance ||= @klass.new(model: @record, resource: @resource, view: @view)
         end
 
         def path