avo 2.23.1 → 2.23.3.pre.1.pr1529

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1abd7f2461a83b2600fe95ba9b43ad968280eea5a935004d5aa357f1ba886ef3
-  data.tar.gz: c7d83c3b5387fe4a3b55715a85c55f6f9ed6a112161dc5ad0f50d9d5b861ea9e
+  metadata.gz: de77547d8082b94984a6b224a19834113f65d52f9c0afd1d169d83026ecbc3fe
+  data.tar.gz: a0eed9b9260291aea7951067164d2dafc0d36dead3b57d189e0263434c5eb831
 SHA512:
-  metadata.gz: 8fd5da850521741506531a0aeb3a3c1d15b58abc9abf998b30a71dfad38ccc9264e9545eade0d8fe0022ad5ecb849f85fca297cfcbb669a4f8a8a66386cf5293
-  data.tar.gz: 232388ce22b3022c37c8263cff87a6050e7f08b764742230adbe1264cee72ee61771b7aca05eb6aff535a45aa80e0f431ddbfabee0631beba44dd453e891c14a
+  metadata.gz: d478cf9410b3437f0ef998857b5f71e27c43b245030dbe5f21acc81ae9d751123bd5c3a6131dd7618fdeb9c12de23c0c6fca7bf36e2d285dd7793144946e40f9
+  data.tar.gz: e9426307d3d13a23aea64ca185c211821f29460cd85ee2b74d876eb538d91d41ee8802d5a2961ede266d0bbe2922d9b8206ac68fc8982002b57cc311df15cbb8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.23.1)
+    avo (2.23.3.pre.1.pr1529)
       actionview (>= 6.0)
       active_link_to
       activerecord (>= 6.0)
@@ -108,24 +108,25 @@ GEM
     aws-sdk-kms (1.58.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.114.0)
+    aws-sdk-s3 (1.116.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
     aws-sigv4 (1.5.1)
       aws-eventstream (~> 1, >= 1.0.2)
     bcrypt (3.1.18)
-    better_html (2.0.1)
-      actionview (>= 6.0)
-      activesupport (>= 6.0)
+    better_html (1.0.16)
+      actionview (>= 4.0)
+      activesupport (>= 4.0)
       ast (~> 2.0)
       erubi (~> 1.4)
+      html_tokenizer (~> 0.0.6)
       parser (>= 2.4)
       smart_properties
     bindex (0.8.1)
-    bootsnap (1.13.0)
+    bootsnap (1.15.0)
       msgpack (~> 1.2)
-    brakeman (5.3.1)
+    brakeman (5.4.0)
     builder (3.2.4)
     bump (0.10.0)
     bundler-integrity (1.0.9)
@@ -142,7 +143,8 @@ GEM
     chartkick (4.2.1)
     childprocess (4.1.0)
     concurrent-ruby (1.1.10)
-    countries (5.1.2)
+    countries (4.2.3)
+      i18n_data (~> 0.16.0)
       sixarm_ruby_unaccent (~> 1.1)
     crack (0.4.5)
       rexml
@@ -162,7 +164,6 @@ GEM
       responders
       warden (~> 1.2.3)
     diff-lcs (1.5.0)
-    digest (3.1.0)
     docile (1.4.0)
     dotenv (2.8.1)
     dotenv-rails (2.8.1)
@@ -190,15 +191,16 @@ GEM
     groupdate (6.1.0)
       activesupport (>= 5.2)
     hashdiff (1.0.1)
-    highline (2.0.3)
+    highline (2.1.0)
     hightop (0.3.0)
       activesupport (>= 5.2)
     hotwire-livereload (1.2.2)
       listen (>= 3.0.0)
       rails (>= 6.0.0)
+    html_tokenizer (0.0.7)
     htmlbeautifier (1.4.2)
-    httparty (0.20.0)
-      mime-types (~> 3.0)
+    httparty (0.21.0)
+      mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
@@ -213,6 +215,8 @@ GEM
       rails-i18n
       rainbow (>= 2.2.2, < 4.0)
       terminal-table (>= 1.5.1)
+    i18n_data (0.16.0)
+      simple_po_parser (~> 1.1)
     image_processing (1.12.2)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
@@ -225,8 +229,8 @@ GEM
     jsbundling-rails (1.0.3)
       railties (>= 6.0.0)
     json (2.6.2)
-    launchy (2.5.0)
-      addressable (~> 2.7)
+    launchy (2.5.2)
+      addressable (~> 2.8)
     listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
@@ -240,24 +244,19 @@ GEM
       zeitwerk
     marcel (1.0.2)
     matrix (0.4.2)
-    meta-tags (2.17.0)
+    meta-tags (2.18.0)
       actionpack (>= 3.2.0, < 7.1)
     method_source (1.0.0)
-    mime-types (3.4.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2022.0105)
-    mini_magick (4.11.0)
+    mini_magick (4.12.0)
     mini_mime (1.1.2)
     mini_portile2 (2.8.0)
-    minitest (5.16.3)
+    minitest (5.17.0)
     msgpack (1.5.6)
     multi_xml (0.6.0)
     net-protocol (0.1.3)
       timeout
-    net-smtp (0.3.1)
-      digest
+    net-smtp (0.3.3)
       net-protocol
-      timeout
     nio4r (2.5.8)
     nokogiri (1.13.10)
       mini_portile2 (~> 2.8.0)
@@ -267,16 +266,16 @@ GEM
     orm_adapter (0.5.0)
     pagy (6.0.0)
     parallel (1.22.1)
-    parser (3.1.2.1)
+    parser (3.2.0.0)
       ast (~> 2.4.1)
-    pg (1.4.3)
+    pg (1.4.5)
     public_suffix (5.0.0)
     puma (5.6.5)
       nio4r (~> 2.0)
     pundit (2.2.0)
       activesupport (>= 3.0.0)
     racc (1.6.1)
-    rack (2.2.4)
+    rack (2.2.5)
     rack-test (2.0.2)
       rack (>= 1.3)
     rails (6.1.6.1)
@@ -314,9 +313,9 @@ GEM
       thor (~> 1.0)
     rainbow (3.1.1)
     rake (13.0.6)
-    ransack (3.2.1)
-      activerecord (>= 6.1.5)
-      activesupport (>= 6.1.5)
+    ransack (3.0.1)
+      activerecord (>= 6.0.4)
+      activesupport (>= 6.0.4)
       i18n
     rb-fsevent (0.11.1)
     rb-inotify (0.10.1)
@@ -329,7 +328,7 @@ GEM
     rexml (3.2.5)
     rspec-core (3.11.0)
       rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
+    rspec-expectations (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-mocks (3.11.1)
@@ -344,7 +343,7 @@ GEM
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
     rspec-support (3.11.0)
-    rubocop (1.35.0)
+    rubocop (1.35.1)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.1.2.1)
@@ -359,20 +358,20 @@ GEM
     rubocop-performance (1.14.3)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-shopify (2.9.0)
-      rubocop (~> 1.33)
+    rubocop-shopify (2.5.0)
+      rubocop (~> 1.25)
     ruby-debug-ide (0.7.3)
       rake (>= 0.8.1)
     ruby-progressbar (1.11.0)
     ruby-vips (2.1.4)
       ffi (~> 1.12)
     rubyzip (2.3.2)
-    selenium-webdriver (4.5.0)
+    selenium-webdriver (4.1.0)
       childprocess (>= 0.5, < 5.0)
       rexml (~> 3.2, >= 3.2.5)
-      rubyzip (>= 1.2.2, < 3.0)
-      websocket (~> 1.0)
-    simplecov (0.21.2)
+      rubyzip (>= 1.2.2)
+    simple_po_parser (1.1.6)
+    simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
@@ -383,18 +382,18 @@ GEM
     simplecov_json_formatter (0.1.4)
     sixarm_ruby_unaccent (1.2.0)
     smart_properties (1.17.0)
-    spring (4.0.0)
+    spring (3.1.1)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
-    sprockets (4.1.1)
+    sprockets (4.2.0)
       concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
+      rack (>= 2.2.4, < 4)
     sprockets-rails (3.4.2)
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    standard (1.16.0)
-      rubocop (= 1.35.0)
+    standard (1.16.1)
+      rubocop (= 1.35.1)
       rubocop-performance (= 1.14.3)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
@@ -407,8 +406,8 @@ GEM
       railties (>= 6.0.0)
     tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.2.0)
-    view_component (2.80.0)
+    unicode-display_width (2.4.0)
+    view_component (2.81.0)
       activesupport (>= 5.2.0, < 8.0)
       concurrent-ruby (~> 1.0)
       method_source (~> 1.0)
@@ -427,7 +426,6 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    websocket (1.2.9)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)

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

@@ -52,7 +52,7 @@
               style: @field.get_html(:style, view: view, element: :input),
               type: type,
               classes: classes("w-full"),
-              view: @resource.view
+              view: view
           %>
           <% else %>
             <%= @form.select @field.id_input_foreign_key,
@@ -88,7 +88,7 @@
         resource: @resource,
         disabled: disabled,
         classes: classes("w-full"),
-        view: @resource.view,
+        view: view,
         style: @field.get_html(:style, view: view, element: :input)
       %>
     <% else %>

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

@@ -50,7 +50,7 @@ class Avo::Fields::BelongsToField::EditComponent < Avo::Fields::EditComponent
   end
 
   def field_html_action
-    @field.get_html(:data, view: @resource.view, element: :input).fetch(:action, nil)
+    @field.get_html(:data, view: view, element: :input).fetch(:action, nil)
   end
 
   private

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

@@ -1,29 +1,22 @@
 <%= field_wrapper **field_wrapper_args do %>
-  <% if @field.display_value %>
-    <div class="text-center text-sm font-semibold w-full leading-none mb-1">
-      <span class="js-progress-bar-value-<%= @field.id %>"><%= @field.value %></span><%= @field.value_suffix if @field.value_suffix.present? %>
-    </div>
+  <%= content_tag :div, data: {controller: "progress-bar-field"} do %>
+    <% if @field.display_value %>
+      <div class="text-center text-sm font-semibold w-full leading-none mb-1">
+        <span data-progress-bar-field-target="label"><%= @field.value %></span><%= @field.value_suffix if @field.value_suffix.present? %>
+      </div>
+    <% end %>
+    <%= @form.range_field @field.id,
+      class: "w-full #{@field.get_html(:classes, view: view, element: :input)}",
+      data: {
+        action: "input->progress-bar-field#update",
+        **@field.get_html(:data, view: view, element: :input)
+      },
+      disabled: disabled?,
+      max: @field.max,
+      min: 0,
+      placeholder: @field.placeholder,
+      step: @field.step,
+      style: @field.get_html(:style, view: view, element: :input)
+    %>
   <% end %>
-  <%= @form.range_field @field.id,
-    class: "w-full #{@field.get_html(:classes, view: view, element: :input)}",
-    data: @field.get_html(:data, view: view, element: :input),
-    disabled: disabled?,
-    max: @field.max,
-    min: 0,
-    placeholder: @field.placeholder,
-    step: @field.step,
-    style: @field.get_html(:style, view: view, element: :input)
-  %>
 <% end %>
-
-
-<script>
-var input = document.getElementById('project_progress');
-var log = document.querySelector('.js-progress-bar-value-<%= @field.id %>');
-
-input.addEventListener('input', updateValue);
-
-function updateValue(e) {
-  log.textContent = e.target.value;
-}
-</script>

data/app/controllers/avo/search_controller.rb

@@ -51,7 +51,7 @@ module Avo
       ).handle
 
       # Get the count
-      results_count = query.unscope(:select).count
+      results_count = query.reselect(:id).count
 
       # Get the results
       query = query.limit(8)

data/app/helpers/avo/application_helper.rb

@@ -133,7 +133,7 @@ module Avo
       field = field_klass.new id, form: form, view: view, **args, &block
 
       # Add the form record to the field so all fields have access to it.
-      field.hydrate(model: form.object)
+      field.hydrate(model: form.object) if form.present?
 
       render field.component_for_view(view).new field: field, form: form, **component_options
     end

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

@@ -0,0 +1,9 @@
+import { Controller } from '@hotwired/stimulus'
+
+export default class extends Controller {
+  static targets = ['label']
+
+  update(e) {
+    this.labelTarget.textContent = e.target.value
+  }
+}

data/app/javascript/js/controllers.js

@@ -19,6 +19,7 @@ import MenuController from './controllers/menu_controller'
 import ModalController from './controllers/modal_controller'
 import MultipleSelectFilterController from './controllers/multiple_select_filter_controller'
 import PerPageController from './controllers/per_page_controller'
+import ProgressBarFieldController from './controllers/fields/progress_bar_field_controller'
 import ResourceEditController from './controllers/resource_edit_controller'
 import ResourceIndexController from './controllers/resource_index_controller'
 import ResourceShowController from './controllers/resource_show_controller'
@@ -67,6 +68,7 @@ application.register('belongs-to-field', BelongsToFieldController)
 application.register('code-field', CodeFieldController)
 application.register('date-field', DateFieldController)
 application.register('key-value', KeyValueController)
+application.register('progress-bar-field', ProgressBarFieldController)
 application.register('simple-mde', SimpleMdeController)
 application.register('trix-field', TrixFieldController)
 

data/config/master.key

@@ -0,0 +1 @@
+2aeb23d82b909d9c6b5abb62f7058c2a

data/lib/avo/fields/base_field.rb

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

data/lib/avo/fields/belongs_to_field.rb

@@ -1,6 +1,5 @@
 module Avo
   module Fields
-
     # The field can be in multiple scenarios where it needs different types of data and displays the state differently.
     # For example the non-polymorphic, non-searchable variant is the easiest to support. You only need to populate a simple select with the ID of the associated record and the list of records.
     # For the searchable polymorphic variant you need to provide the type of the association (Post, Project, Team), the label of the associated record ("Cool post title") and the ID of that record.
@@ -118,7 +117,7 @@ module Avo
         resource = target_resource
         resource = App.get_resource_by_model_name model if model.present?
 
-        query = Avo::Services::AuthorizationService.apply_policy(user, resource.class.query_scope)
+        query = resource.class.query_scope
 
         if attach_scope.present?
           query = Avo::Hosts::AssociationScopeHost.new(block: attach_scope, query: query, parent: get_model).handle

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "2.23.1" unless const_defined?(:VERSION)
+  VERSION = "2.23.3.pre.1.pr1529" unless const_defined?(:VERSION)
 end