avo 1.22.3 → 1.22.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0638fa0ab76323be01a732489a1ba96def10bde4897fd4231c7a1f4c41ece424'
-  data.tar.gz: 394c86583f0219b3f9c5d2cf1017db4348105ae8bc26cfbac1f5ca56e9ace62a
+  metadata.gz: 472b0c4d748a2cc35c595170f3abd2c83e8ef62ea2f41ec15ba2fac1b4fba4eb
+  data.tar.gz: 28de6b788064fb476e80234f058e192dae5bc1866bb544c7db197a53adf801dd
 SHA512:
-  metadata.gz: 292f817a4cc4498a4db69268def16be6ac719e5eee1178deb8cad7a26181aacb73ec5cbd9145fea1a0dc627a52f4bc7b9a3e61e5e6099946148239227b313e4d
-  data.tar.gz: bad4042ec546cb0c56e209a8c42b59a74a655a5bd8278c7f98baf5025f81d3457b566316fc4f7247d51e68d4add071d6207996e922449106ce3627357e1a2545
+  metadata.gz: a89890b81a8d26b13f7ace5e3854b21b503bf7ae3e61c08e4ba0a52257b4644cb29f3c8a03789726aa9e4479b2a0c5f334163536198f8685f9df516539191467
+  data.tar.gz: 14402ad63c9918b69789dd0161124a06f74829f400138ff8cf972a36df7ac677b9d62319355b26f6a8da9db38c686d28728431a4d6c81ab3202e7df3c4779df3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (1.22.3)
+    avo (1.22.4)
       active_link_to
       addressable
       breadcrumbs_on_rails

data/app/components/avo/navigation_link_component.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Avo::NavigationLinkComponent < ViewComponent::Base
-  def initialize(label: nil, path: nil, active: :inclusive, size: :md, target: "_self")
+  def initialize(label: nil, path: nil, active: :inclusive, size: :md, target: nil)
     @label = label
     @path = path
     @active = active

data/app/controllers/avo/application_controller.rb

@@ -13,6 +13,7 @@ module Avo
     protect_from_forgery with: :exception
     before_action :init_app
     before_action :check_avo_license
+    before_action :set_locale
     before_action :set_authorization
     before_action :_authenticate!
     before_action :set_container_classes
@@ -245,5 +246,11 @@ module Avo
     def model_param_key
       @resource.form_scope
     end
+
+    def set_locale
+      I18n.locale = params[:locale] || I18n.default_locale
+
+      I18n.default_locale = I18n.locale
+    end
   end
 end

data/app/controllers/avo/base_controller.rb

@@ -84,7 +84,6 @@ module Avo
     def new
       @model = @resource.model_class.new
       @resource = @resource.hydrate(model: @model, view: :new, user: _current_user)
-      # abort @model.course.inspect
 
       @page_title = @resource.default_panel_name
       add_breadcrumb resource_name.humanize, resources_path(resource: @resource)

data/app/javascript/js/controllers/modal_controller.js

@@ -8,4 +8,13 @@ export default class extends Controller {
 
     document.dispatchEvent(new Event('actions-modal:close'))
   }
+
+  delayedClose() {
+    const vm = this
+
+    setTimeout(() => {
+      vm.modalTarget.remove()
+      document.dispatchEvent(new Event('actions-modal:close'))
+    }, 500)
+  }
 }

data/app/javascript/js/controllers/search_controller.js

@@ -177,11 +177,16 @@ export default class extends Controller {
       openOnFocus: true,
       detachedMediaQuery: '',
       getSources: ({ query }) => {
+        document.body.classList.add('search-loading')
         const endpoint = that.searchUrl(query)
 
         return that
           .debouncedFetch(endpoint)
-          .then((response) => response.json())
+          .then((response) => {
+            document.body.classList.remove('search-loading')
+
+            return response.json()
+          })
           .then((data) => Object.keys(data).map((resourceName) => that.addSource(resourceName, data[resourceName])))
       },
     })

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

@@ -7,7 +7,11 @@
     data-resource-id="<%= params[:id] %>"
     class="hidden text-slate-800"
   >
-    <%= form_with model: @model, scope: 'fields', url: "#{@resource.records_path}/actions/#{@action.param_id}", data: {'turbo-frame': '_top', 'action-target': 'form'} do |form| %>
+    <%= form_with model: @model,
+      scope: 'fields',
+      url: "#{@resource.records_path}/actions/#{@action.param_id}",
+      data: @action.class.form_data_attributes do |form|
+    %>
       <%= render Avo::ModalComponent.new do |c| %>
         <% c.heading do %>
           <%= @action.action_name %>
@@ -26,8 +30,8 @@
         <% end %>
 
         <% c.controls do %>
-          <%= a_button @action.cancel_button_label, 'data-action': 'click->modal#close', size: :sm %>
-          <%= a_button @action.confirm_button_label, type: :submit, color: :green, size: :sm %>
+          <%= a_button @action.cancel_button_label, data: { action: 'click->modal#close' }, size: :sm %>
+          <%= a_button @action.confirm_button_label, type: :submit, color: :green, size: :sm, data: @action.class.submit_button_data_attributes %>
         <% end %>
       <% end %>
     <% end %>

data/lib/avo/base_action.rb

@@ -15,6 +15,7 @@ module Avo
     class_attribute :fields
     class_attribute :standalone, default: false
     class_attribute :visible
+    class_attribute :may_download_file, default: false
 
     attr_accessor :response
     attr_accessor :model
@@ -22,6 +23,26 @@ module Avo
     attr_accessor :user
     attr_accessor :fields_loader
 
+    class << self
+      def form_data_attributes
+        # We can't respond with a file download from Turbo se we disable it on the form
+        if may_download_file
+          { 'turbo': false }
+        else
+          { 'turbo-frame': '_top', 'action-target': 'form' }
+        end
+      end
+
+      # We can't respond with a file download from Turbo se we disable close the modal manually after a while (it's a hack, we know)
+      def submit_button_data_attributes
+        if may_download_file
+          { action: 'click->modal#delayedClose' }
+        else
+          {}
+        end
+      end
+    end
+
     def action_name
       return name if name.present?
 

data/lib/avo/licensing/h_q.rb

@@ -23,6 +23,12 @@ module Avo
 
         begin
           perform_and_cache_request
+        rescue Errno::EHOSTUNREACH => exception
+          cache_and_return_error "HTTP host not reachable error.", exception.message
+        rescue Errno::ECONNRESET => exception
+          cache_and_return_error "HTTP connection reset error.", exception.message
+        rescue Errno::ECONNREFUSED => exception
+          cache_and_return_error "HTTP connection refused error.", exception.message
         rescue HTTParty::Error => exception
           cache_and_return_error "HTTP client error.", exception.message
         rescue Net::OpenTimeout => exception
@@ -71,7 +77,55 @@ module Avo
           environment: Rails.env,
           ip: current_request.ip,
           host: current_request.host,
-          port: current_request.port
+          port: current_request.port,
+          app_name: app_name
+        }
+      end
+
+      def app_name
+        Rails.application.class.to_s.split("::").first
+      rescue
+        nil
+      end
+
+      def avo_metadata
+        resources = App.resources
+        field_definitions = resources.map(&:get_field_definitions)
+        fields_count = field_definitions.map(&:count).sum
+        fields_per_resource = sprintf("%0.01f", fields_count / (resources.count + 0.0))
+
+        field_types = {}
+        custom_fields_count = 0
+        field_definitions.each do |fields|
+          fields.each do |field|
+            field_types[field.type] ||= 0
+            field_types[field.type] += 1
+
+            custom_fields_count += 1 if field.custom?
+          end
+        end
+
+        {
+          resources_count: resources.count,
+          fields_count: fields_count,
+          fields_per_resource: fields_per_resource,
+          custom_fields_count: custom_fields_count,
+          field_types: field_types,
+          **other_metadata(:actions),
+          **other_metadata(:filters),
+        }
+      end
+
+      def other_metadata(type = :actions)
+        resources = App.resources
+
+        types = resources.map(&:"get_#{type}")
+        type_count = types.flatten.uniq.count
+        type_per_resource = sprintf("%0.01f", types.map(&:count).sum / (resources.count + 0.0))
+
+        {
+          "#{type}_count": type_count,
+          "#{type}_per_resource": type_per_resource,
         }
       end
 

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "1.22.3"
+  VERSION = "1.22.4"
 end

data/public/avo-assets/avo.js

@@ -83839,6 +83839,13 @@
       this.modalTarget.remove();
       document.dispatchEvent(new Event("actions-modal:close"));
     }
+    delayedClose() {
+      const vm = this;
+      setTimeout(() => {
+        vm.modalTarget.remove();
+        document.dispatchEvent(new Event("actions-modal:close"));
+      }, 500);
+    }
   };
   __publicField(modal_controller_default, "targets", ["modal"]);
 
@@ -87614,8 +87621,12 @@
         openOnFocus: true,
         detachedMediaQuery: "",
         getSources: ({ query }) => {
+          document.body.classList.add("search-loading");
           const endpoint = that.searchUrl(query);
-          return that.debouncedFetch(endpoint).then((response) => response.json()).then((data) => Object.keys(data).map((resourceName) => that.addSource(resourceName, data[resourceName])));
+          return that.debouncedFetch(endpoint).then((response) => {
+            document.body.classList.remove("search-loading");
+            return response.json();
+          }).then((data) => Object.keys(data).map((resourceName) => that.addSource(resourceName, data[resourceName])));
         }
       });
       if (this.buttonTarget.dataset.shouldBeDisabled !== "true") {