avo 2.45.0 → 2.47.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3eeaf7c4479bd7cd5c0e45ca017ab8527a0d0ddf5fe625bc0bee728d5be654eb
-  data.tar.gz: 6f8538be2082861d11a2c150cd670733978d8631885aa7693c0d6b9770a97535
+  metadata.gz: 38ab852dd9e98b8a3096344f2fd4e3145e937a2cbbef3524adea0fb7339c6949
+  data.tar.gz: 5140ed4d3a7075d2ed3c539ea87134026b43eba770d0615ad3ffb1694ed9dc77
 SHA512:
-  metadata.gz: 48a019b6179859de05f19839922ae41f391f08112f436c0946a526c5b36bc027855f5220c118c0588c66fecaea0d5ba59978d98803b1311884261f472f267efc
-  data.tar.gz: a5e00b21b9c62e5825718aec9bff93d8759b67f318edd93ba488a3f2caa2d7af3d7143f25917b6d475557b5d52648dc8f23bdb09d95194bc8278531be653e722
+  metadata.gz: 149111feccf530c8da825b8367632a04bb35960e6d9ec3f95c5b2379abcff11a6e1e6e75661c506c9211af56ac4416fe54fb08f0ca9dd849ae934d3e54fa7628
+  data.tar.gz: 5016d7212fa9dac1aa76868e1fa0bd84930e27c4f5e800892c14bc96c1bf5876aca88357bfd77c1a7995300b3aba75dabce0d6d97eafb09090af49e1676e9862

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.45.0)
+    avo (2.47.0)
       actionview (>= 6.0)
       active_link_to
       activerecord (>= 6.0)
@@ -269,10 +269,10 @@ GEM
     net-smtp (0.3.3)
       net-protocol
     nio4r (2.5.9)
-    nokogiri (1.15.4)
+    nokogiri (1.16.0)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.15.4-x86_64-linux)
+    nokogiri (1.16.0-x86_64-linux)
       racc (~> 1.4)
     orm_adapter (0.5.0)
     pagy (6.0.4)

data/app/components/avo/field_wrapper_component.rb

@@ -35,6 +35,7 @@ class Avo::FieldWrapperComponent < ViewComponent::Base
     @full_width = full_width
     @label = label
     @resource = resource
+    @action = field.action
     @stacked = stacked
     @style = style
     @view = view
@@ -83,9 +84,11 @@ class Avo::FieldWrapperComponent < ViewComponent::Base
 
     # Add the built-in stimulus integration data tags.
     if @resource.present?
-      @resource.get_stimulus_controllers.split(" ").each do |controller|
-        attributes["#{controller}-target"] = "#{@field.id.to_s.underscore}_#{@field.type.to_s.underscore}_wrapper".camelize(:lower)
-      end
+      add_stimulus_attributes_for(@resource, attributes)
+    end
+
+    if @action.present?
+      add_stimulus_attributes_for(@action, attributes)
     end
 
     # Fetch the data attributes off the html option
@@ -115,4 +118,12 @@ class Avo::FieldWrapperComponent < ViewComponent::Base
   def full_width?
     @full_width
   end
+
+  private
+
+  def add_stimulus_attributes_for(entity, attributes)
+    entity.get_stimulus_controllers.split(" ").each do |controller|
+      attributes["#{controller}-target"] = "#{@field.id.to_s.underscore}_#{@field.type.to_s.underscore}_wrapper".camelize(:lower)
+    end
+  end
 end

data/app/components/avo/fields/belongs_to_field/edit_component.rb

@@ -63,7 +63,7 @@ class Avo::Fields::BelongsToField::EditComponent < Avo::Fields::EditComponent
     helpers.new_resource_path(**{
       via_relation: @field.id.to_s,
       resource: target_resource || @field.target_resource,
-      via_resource_id: resource.model.to_param,
+      via_resource_id: resource.model.persisted? ? resource.model.to_param : nil,
       via_belongs_to_resource_class: resource.class.name
     }.compact)
   end

data/app/javascript/js/controllers/fields/key_value_controller.js

@@ -1,4 +1,5 @@
 /* eslint-disable max-len */
+import * as DOMPurify from 'dompurify'
 import { Controller } from '@hotwired/stimulus'
 import { castBoolean } from '../../helpers/cast_boolean'
 
@@ -80,7 +81,7 @@ export default class extends Controller {
     let index = 0
     this.fieldValue.forEach((row) => {
       const [key, value] = row
-      result += this.interpolatedRow(key, value, index)
+      result += this.interpolatedRow(DOMPurify.sanitize(key), DOMPurify.sanitize(value), index)
       index++
     })
     this.rowsTarget.innerHTML = result

data/app/views/avo/actions/show.html.erb

@@ -1,6 +1,6 @@
 <%= turbo_frame_tag "actions_show" do %>
   <div
-    data-controller="action"
+    data-controller="<%= ["action", @action.get_stimulus_controllers].join(" ") %>"
     data-no-confirmation="<%= @action.no_confirmation %>"
     data-action-target="controllerDiv"
     data-resource-name="<%= @resource.model_key %>"
@@ -27,7 +27,7 @@
         <div class="my-4 -mx-6">
           <% @action.get_fields.each_with_index do |field, index| %>
             <%= render field
-              .hydrate(resource: @resource, model: @resource.model, user: @resource.user, view: @view)
+              .hydrate(resource: @resource, model: @resource.model, user: @resource.user, view: @view, action: @action)
               .component_for_view(@view)
               .new(field: field, resource: @resource, index: index, form: form, compact: true)
             %>

data/lib/avo/base_action.rb

@@ -1,6 +1,7 @@
 module Avo
   class BaseAction
     include Avo::Concerns::HasFields
+    include Avo::Concerns::HasActionStimulusControllers
 
     class_attribute :name, default: nil
     class_attribute :message

data/lib/avo/base_resource.rb

@@ -6,7 +6,7 @@ module Avo
     include Avo::Concerns::HasFields
     include Avo::Concerns::CanReplaceFields
     include Avo::Concerns::HasEditableControls
-    include Avo::Concerns::HasStimulusControllers
+    include Avo::Concerns::HasResourceStimulusControllers
     include Avo::Concerns::ModelClassConstantized
     include Avo::Concerns::Pagination
 

data/lib/avo/concerns/has_action_stimulus_controllers.rb

@@ -0,0 +1,15 @@
+module Avo
+  module Concerns
+    module HasActionStimulusControllers
+      extend ActiveSupport::Concern
+
+      included do
+        class_attribute :stimulus_controllers, default: ""
+      end
+
+      def get_stimulus_controllers
+        self.class.stimulus_controllers
+      end
+    end
+  end
+end

data/lib/avo/concerns/has_html_attributes.rb

@@ -27,7 +27,10 @@ module Avo
           default_attribute_value name
         end
 
-        add_default_data_attributes attributes, name, element, view
+        add_action_data_attributes(attributes, name, element)
+        add_resource_data_attributes(attributes, name, element, view)
+
+        attributes
       end
 
       private
@@ -47,18 +50,17 @@ module Avo
         name == :data ? {} : ""
       end
 
-      def add_default_data_attributes(attributes, name, element, view)
-        if !attributes.nil? && name == :data && element == :input && view.in?([:edit, :new]) && resource.present? && resource.respond_to?(:get_stimulus_controllers)
-          extra_attributes = resource.get_stimulus_controllers
-            .split(" ")
-            .map do |controller|
-              [:"#{controller}-target", "#{id.to_s.underscore}_#{type.to_s.underscore}_input".camelize(:lower)]
-            end
-            .to_h
+      def add_action_data_attributes(attributes, name, element)
+        if can_add_stimulus_attributes_for?(action, attributes, name, element)
+          attributes.merge!(stimulus_attributes_for(action))
+        end
+      end
 
-          attributes.merge extra_attributes
-        else
-          attributes
+      def add_resource_data_attributes(attributes, name, element, view)
+        if can_add_stimulus_attributes_for?(resource, attributes, name, element) && view.in?([:edit, :new])
+          resource_stimulus_attributes = stimulus_attributes_for(resource)
+
+          attributes.merge!(resource_stimulus_attributes)
         end
       end
 
@@ -103,6 +105,19 @@ module Avo
 
         result if result.present?
       end
+
+      def can_add_stimulus_attributes_for?(entity, attributes, name, element)
+        !attributes.nil? && name == :data && element == :input && entity.present? && entity.respond_to?(:get_stimulus_controllers)
+      end
+
+      def stimulus_attributes_for(entity)
+        entity.get_stimulus_controllers
+          .split(" ")
+          .map do |controller|
+            [:"#{controller}-target", "#{id.to_s.underscore}_#{type.to_s.underscore}_input".camelize(:lower)]
+          end
+          .to_h
+      end
     end
   end
 end

data/lib/avo/concerns/{has_stimulus_controllers.rb → has_resource_stimulus_controllers.rb}

@@ -1,6 +1,6 @@
 module Avo
   module Concerns
-    module HasStimulusControllers
+    module HasResourceStimulusControllers
       extend ActiveSupport::Concern
 
       included do

data/lib/avo/fields/base_field.rb

@@ -85,6 +85,7 @@ module Avo
         @value = args[:value] || nil
         @stacked = args[:stacked] || nil
         @resource = args[:resource]
+        @action = args[:action]
 
         @args = args
 

data/lib/avo/licensing/h_q.rb

@@ -6,7 +6,7 @@ module Avo
 
       ENDPOINT = "https://avohq.io/api/v1/licenses/check".freeze unless const_defined?(:ENDPOINT)
       REQUEST_TIMEOUT = 5 unless const_defined?(:REQUEST_TIMEOUT) # seconds
-      CACHE_TIME = 3600 unless const_defined?(:CACHE_TIME) # seconds
+      CACHE_TIME = 3600*12 unless const_defined?(:CACHE_TIME) # seconds
 
       class << self
         def cache_key

data/lib/avo/version.rb

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

data/lib/generators/avo/templates/locales/avo.ar.yml

@@ -5,7 +5,7 @@ ar:
     actions: أوامر
     and_x_other_resources: و %{count} موارد أخرى
     are_you_sure: هل أنت متأكد؟
-    are_you_sure_detach_item: هل أنت متأكد أنك تريد فصل هذا الـ٪{item}؟
+    are_you_sure_detach_item: هل أنت متأكد أنك تريد فصل هذا الـ%{item}؟
     are_you_sure_you_want_to_run_this_option: هل أنت متأكد أنك تريد تشغيل هذا الخيار؟
     attach: ربط
     attach_and_attach_another: ربط وربط آخر