avo 2.32.5 → 2.32.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc2e0d4d0438f400a3ceb9929a504b9b9f42e760155a6321c9cbca07e575f52b
-  data.tar.gz: d023300fd0ca0d5484c05545da79f495fd1e2f47e2c8576353a4d87eec23dc9c
+  metadata.gz: 6cd2f99c299bdf5412dbf9650696b335b9157c226c3f24fb0d80b04b6d9a5eae
+  data.tar.gz: 3586667c9311be37ed01fc950afca11455e08a3e02fa14965797c7c25119dbb3
 SHA512:
-  metadata.gz: 8335667ee5a3c608c6533d758fccc92508a20ca927c75acd890761ffe1ee2d3a1ebbb72c7ddb56e94162a0d72bd36eaf606ebfdf85217c33a971f9e26358c8c2
-  data.tar.gz: b2dbeb103ac187a839526bf614afdda7bf6fdfd73a242e2323308b8332df738575fe5469f87a85d7cab95be29ea75e47fc7118cfd54bfbcece6cd545978b63c2
+  metadata.gz: 76635e0735361495b584e9cff07913733c10016403c6d572098f9c6d793cb8403741d2eb789dd1105941cbff3232b98ab2882314ccb3c5172532fe5f3bf8e3cb
+  data.tar.gz: a0a1799b442787df8e39537f64ad8380a1a82d30baa4c58fe4f14eee294100ba814187ecfbbed8c2471bf04b0287ae0bbe10c2151a8573e2c1c40a282fb8a7b0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.32.5)
+    avo (2.32.6)
       actionview (>= 6.0)
       active_link_to
       activerecord (>= 6.0)

data/app/assets/stylesheets/avo.base.css

@@ -1,4 +1,4 @@
-@import './../../../node_modules/simplemde/dist/simplemde.min.css';
+@import './../../../node_modules/easymde/dist/easymde.min.css';
 @import './../../../node_modules/tippy.js/dist/tippy.css';
 @import './../../../node_modules/tippy.js/themes/light.css';
 @import './../../../node_modules/flatpickr/dist/flatpickr.css';

data/app/components/avo/actions_component.rb

@@ -4,11 +4,12 @@ class Avo::ActionsComponent < ViewComponent::Base
   include Avo::ApplicationHelper
   attr_reader :label
 
-  def initialize(actions: [], resource: nil, view: nil, exclude: [], style: :outline, color: :primary, label: nil)
+  def initialize(actions: [], resource: nil, view: nil, exclude: [], include: [], style: :outline, color: :primary, label: nil)
     @actions = actions || []
     @resource = resource
     @view = view
     @exclude = exclude
+    @include = include
     @color = color
     @style = style
     @label = label || I18n.t("avo.actions")
@@ -19,7 +20,13 @@ class Avo::ActionsComponent < ViewComponent::Base
   end
 
   def actions
-    @actions.reject { |action| action.class.in?(@exclude) }
+    if @exclude.present?
+      @actions.reject { |action| action.class.in?(@exclude) }
+    elsif @include.present?
+      @actions.select { |action| action.class.in?(@include) }
+    else
+      @actions
+    end
   end
 
   # When running an action for one record we should do it on a special path.

data/app/components/avo/fields/markdown_field/edit_component.html.erb

@@ -1,10 +1,10 @@
 <%= field_wrapper **field_wrapper_args, full_width: true do %>
-  <div data-controller="simple-mde">
+  <div data-controller="easy-mde">
     <%= @form.text_area @field.id,
-      class: classes("w-full js-has-simple-mde-editor"),
+      class: classes("w-full js-has-easy-mde-editor"),
       data: {
         view: view,
-        'simple-mde-target': 'element',
+        'easy-mde-target': 'element',
         'component-options': @field.options.to_json,
       },
       disabled: disabled?,

data/app/components/avo/fields/markdown_field/show_component.html.erb

@@ -1,10 +1,10 @@
 <%= field_wrapper **field_wrapper_args, full_width: true do %>
-  <div data-controller="simple-mde">
+  <div data-controller="easy-mde">
     <%= text_area_tag @field.id, @field.value,
-      class: helpers.input_classes('w-full js-has-simple-mde-editor'),
+      class: helpers.input_classes('w-full js-has-easy-mde-editor'),
       placeholder: @field.placeholder,
       disabled: disabled?,
-      'data-simple-mde-target': 'element',
+      'data-easy-mde-target': 'element',
       'data-component-options': @field.options.to_json,
       'data-view': :show %>
   </div>

data/app/components/avo/views/resource_show_component.html.erb

@@ -40,19 +40,19 @@
               <% end %>
             <% end %>
           <% elsif can_see_the_actions_button? && control.actions_list? %>
-            <%= render Avo::ActionsComponent.new actions: @actions, resource: @resource, view: @view, exclude: control.exclude, style: control.style, color: control.color, label: control.label %>
+            <%= render Avo::ActionsComponent.new actions: @actions, resource: @resource, view: @view, exclude: control.exclude, include: control.include, style: control.style, color: control.color, label: control.label %>
           <% elsif control.edit_button? %>
             <% if @resource.authorization.authorize_action(:edit, raise_exception: false) %>
-            <% end %>
-            <%= a_link edit_path,
-                color: :primary,
-                style: :primary,
-                title: control.title,
-                data: {
-                  tippy: control.title ? :tooltip : nil,
-                },
-                icon: 'edit' do %>
-              <%= control.label %>
+              <%= a_link edit_path,
+                  color: :primary,
+                  style: :primary,
+                  title: control.title,
+                  data: {
+                    tippy: control.title ? :tooltip : nil,
+                  },
+                  icon: 'edit' do %>
+                <%= control.label %>
+              <% end %>
             <% end %>
           <% elsif control.action? %>
             <%= a_link control.path,

data/app/javascript/js/controllers/fields/{simple_mde_controller.js → easy_mde_controller.js}

@@ -1,5 +1,5 @@
 import { Controller } from '@hotwired/stimulus'
-import SimpleMDE from 'simplemde'
+import EasyMDE from 'easymde'
 
 export default class extends Controller {
   static targets = ['element']
@@ -27,9 +27,9 @@ export default class extends Controller {
       options.status = false
     }
 
-    const simpleMde = new SimpleMDE(options)
+    const easyMde = new EasyMDE(options)
     if (this.view === 'show') {
-      simpleMde.codemirror.options.readOnly = true
+      easyMde.codemirror.options.readOnly = true
     }
   }
 }

data/app/javascript/js/controllers.js

@@ -9,6 +9,7 @@ import CodeFieldController from './controllers/fields/code_field_controller'
 import CopyToClipboardController from './controllers/copy_to_clipboard_controller'
 import DashboardCardController from './controllers/dashboard_card_controller'
 import DateFieldController from './controllers/fields/date_field_controller'
+import EasyMdeController from './controllers/fields/easy_mde_controller'
 import FilterController from './controllers/filter_controller'
 import HiddenInputController from './controllers/hidden_input_controller'
 import ItemSelectAllController from './controllers/item_select_all_controller'
@@ -27,7 +28,6 @@ import SearchController from './controllers/search_controller'
 import SelectController from './controllers/select_controller'
 import SelectFilterController from './controllers/select_filter_controller'
 import SidebarController from './controllers/sidebar_controller'
-import SimpleMdeController from './controllers/fields/simple_mde_controller'
 import TabsController from './controllers/tabs_controller'
 import TagsFieldController from './controllers/fields/tags_field_controller'
 import TextFilterController from './controllers/text_filter_controller'
@@ -67,9 +67,9 @@ application.register('toggle-panel', TogglePanelController)
 application.register('belongs-to-field', BelongsToFieldController)
 application.register('code-field', CodeFieldController)
 application.register('date-field', DateFieldController)
+application.register('easy-mde', EasyMdeController)
 application.register('key-value', KeyValueController)
 application.register('progress-bar-field', ProgressBarFieldController)
-application.register('simple-mde', SimpleMdeController)
 application.register('trix-field', TrixFieldController)
 
 // Custom controllers

data/lib/avo/base_action.rb

@@ -82,7 +82,12 @@ module Avo
 
     def get_attributes_for_action
       get_fields.map do |field|
-        [field.id, field.value || field.default]
+        default_value = if field.default.respond_to? :call
+          Avo::Hosts::ResourceViewRecordHost.new(block: field.default, record: self.class.model, view: view, resource: self.class.resource).handle
+        else
+          field.default
+        end
+        [field.id, field.value || default_value]
       end.to_h
     end
 

data/lib/avo/concerns/filters_session_handler.rb

@@ -1,4 +1,3 @@
-
 module Avo
   module Concerns
     module FiltersSessionHandler

data/lib/avo/configuration.rb

@@ -2,8 +2,9 @@ module Avo
   class Configuration
     include ResourceConfiguration
 
+    attr_writer :app_name
+    attr_writer :branding
     attr_writer :root_path
-    attr_accessor :app_name
     attr_accessor :timezone
     attr_accessor :per_page
     attr_accessor :per_page_steps
@@ -43,7 +44,6 @@ module Avo
     attr_accessor :sign_out_path_name
     attr_accessor :resources
     attr_accessor :prefix_path
-    attr_writer :branding
 
     def initialize
       @root_path = "/avo"
@@ -139,6 +139,14 @@ module Avo
     def branding
       Avo::Configuration::Branding.new(**@branding || {})
     end
+
+    def app_name
+      if @app_name.respond_to? :call
+        Avo::Hosts::BaseHost.new(block: @app_name).handle
+      else
+        @app_name
+      end
+    end
   end
 
   def self.configuration

data/lib/avo/resources/controls/actions_list.rb

@@ -6,6 +6,10 @@ module Avo
           Array.wrap(@args[:exclude]) || []
         end
 
+        def include
+          Array.wrap(@args[:include]) || []
+        end
+
         def color
           @args[:color] || :primary
         end

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "2.32.5" unless const_defined?(:VERSION)
+  VERSION = "2.32.6" unless const_defined?(:VERSION)
 end

data/lib/generators/avo/resource_generator.rb

@@ -181,7 +181,7 @@ module Generators
       end
 
       def field_from_through_association(association)
-        if association.through_reflection.is_a? ActiveRecord::Reflection::HasManyReflection
+        if association.through_reflection.is_a?(ActiveRecord::Reflection::HasManyReflection) || association.through_reflection.is_a?(ActiveRecord::Reflection::ThroughReflection)
           {
             field: "has_many",
             options: {