avo 2.1.2.pre2 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bde8997aaf953104f34a221e6be3c93b6c7f20bc1b9f125615c0ff994cc6791f
-  data.tar.gz: ca3a39976e8046d165cdb66a8aad6260e98d869981e73eba1d6d121bb57a7580
+  metadata.gz: 6ddda419ee56fc6958c6014c1c87c4fc42d33564b4c3c6642b369729f2948b48
+  data.tar.gz: 8b76cd83e1c6fd3a4ea564ee09d4507b2de1034c390e3cf5d7ae4ec175a569e0
 SHA512:
-  metadata.gz: 50c30c580b89ad850a34c0125ad0079d34a1af72eefbb99193644f605692ea5f3e2bb54e1a0032ef04e219ba84888171cfcf6b69c6da045475f21afc50747680
-  data.tar.gz: 0ce0f8be40b683c2c1ef5b8e963bbbb0d8282e4e0b7d193f4acedee530d9618481a036a0c3955214d4c024876a374009c82df85a788708aebf603943595218c1
+  metadata.gz: 52494cb524f70561a7ab099f44c1df29faf56897d7f487337a1d1831964e3732d31d69be7644b4adeb4a60b79e3199b2d931f5c2a726d8e2f136d6d40256b719
+  data.tar.gz: 2ce7d38f174655a677de092a486357fef13deca755839bd305eaf65ca81f5fd33eea543b69939ce396f65f752673b1131910044bb5ac923b71c0178ff7b8736c

data/Gemfile

@@ -34,7 +34,7 @@ gem "puma", "~> 5.6.4"
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
 # gem "jbuilder", "~> 2.7"
 # Use Redis adapter to run Action Cable in production
-# gem 'redis', '~> 4.0'
+gem 'redis', '~> 4.0'
 # Use Active Model has_secure_password
 # gem 'bcrypt', '~> 3.1.7'
 
@@ -79,6 +79,8 @@ group :development do
   # gem 'pry-rails'
 
   gem 'htmlbeautifier'
+
+  gem "hotwire-livereload", "~> 1.1"
 end
 
 group :development, :test do

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.1.2.pre2)
+    avo (2.2.0)
       active_link_to
       addressable
       breadcrumbs_on_rails
@@ -183,6 +183,9 @@ GEM
     hashdiff (1.0.1)
     hightop (0.3.0)
       activesupport (>= 5.2)
+    hotwire-livereload (1.1.0)
+      listen (>= 3.0.0)
+      rails (>= 6.0.0)
     hotwire-rails (0.1.3)
       rails (>= 6.0.0)
       stimulus-rails
@@ -297,6 +300,7 @@ GEM
     rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
+    redis (4.6.0)
     regexp_parser (2.2.0)
     responders (3.0.1)
       actionpack (>= 5.0)
@@ -435,6 +439,7 @@ DEPENDENCIES
   gem-release
   groupdate
   hightop
+  hotwire-livereload (~> 1.1)
   hotwire-rails
   htmlbeautifier
   httparty
@@ -452,6 +457,7 @@ DEPENDENCIES
   rails (~> 6.1.0)
   rails-controller-testing
   ransack
+  redis (~> 4.0)
   rspec-rails (~> 4.0.0)
   rubocop
   rubocop-shopify

data/app/components/avo/button_component.rb

@@ -24,8 +24,12 @@ class Avo::ButtonComponent < ViewComponent::Base
   end
 
   def args
-    if @args[:spinner]
+    if @args[:loading]
       @args[:"data-controller"] = "loading-button"
+
+      if @args[:confirm]
+        @args[:"data-avo-confirm"] = @args.delete(:confirm)
+      end
     end
 
     @args[:class] = button_classes
@@ -34,7 +38,7 @@ class Avo::ButtonComponent < ViewComponent::Base
   end
 
   def button_classes
-    classes = "button-component inline-flex flex-grow-0 items-center text-sm font-semibold leading-6 fill-current whitespace-nowrap transition duration-100 transform transition duration-100 cursor-pointer disabled:cursor-not-allowed disabled:opacity-30 border justify-center active:outline active:outline-1 #{@class}"
+    classes = "button-component inline-flex flex-grow-0 items-center text-sm font-semibold leading-6 fill-current whitespace-nowrap transition duration-100 transform transition duration-100 cursor-pointer disabled:cursor-not-allowed disabled:opacity-70 border justify-center active:outline active:outline-1 #{@class}"
 
     classes += " rounded" if @rounded.present?
 

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

@@ -7,6 +7,7 @@
   ></div>
   <div class="relative w-full" autocomplete="off">
     <%= @form.text_field @foreign_key,
+      type: :text,
       value: field_label,
       class: helpers.input_classes('w-full', has_error: @field.model_errors.include?(@field.id)),
       placeholder: @field.placeholder,

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

@@ -9,8 +9,11 @@ class Avo::Fields::BelongsToField::EditComponent < Avo::Fields::EditComponent
 
   def disabled
     return true if @field.readonly
-    return true if @field.target_resource.present? && @field.target_resource.model_class.name == params[:via_resource_class]
-    return true if @field.id.to_s == params[:via_relation].to_s
+
+    # When visiting the record through it's association we keep the field disabled by default
+    # We make an exception when the user deliberately instructs Avo to allow detaching in this scenario
+    return !@field.allow_via_detaching if @field.target_resource.present? && @field.target_resource.model_class.name == params[:via_resource_class]
+    return !@field.allow_via_detaching if @field.id.to_s == params[:via_relation].to_s
 
     false
   end

data/app/components/avo/index/grid_item_component.html.erb

@@ -3,7 +3,9 @@
   <%== item_selector_init @resource %>
 >
   <div class="relative w-full pb-3/4 rounded-t overflow-hidden">
-    <%== item_selector_input floating: true, size: :lg %>
+    <% if @resource.record_selector %>
+      <%== item_selector_input floating: true, size: :lg %>
+    <% end %>
     <% if cover.blank? %>
       <%= link_to cover.link_to_resource do %>
         <%= render Avo::Index::GridCoverEmptyStateComponent.new %>

data/app/components/avo/index/table_row_component.html.erb

@@ -2,11 +2,13 @@
   class="bg-white hover:bg-blue-50 hover:shadow-row hover:z-[21] relative z-20 border-b"
   <%== item_selector_init @resource %>
 >
-  <td class="w-10">
-    <div class="flex justify-center h-full">
-      <%== item_selector_input floating: false %>
-    </div>
-  </td>
+  <% if @resource.record_selector %>
+    <td class="w-10">
+      <div class="flex justify-center h-full">
+        <%== item_selector_input floating: false %>
+      </div>
+    </td>
+  <% end %>
   <% @resource.get_fields(reflection: @reflection).each_with_index do |field, index| %>
     <%= render field.component_for_view(:index).new(field: field, resource: @resource, index: index, parent_model: @parent_model) %>
   <% end %>

data/app/components/avo/panel_component.html.erb

@@ -1,19 +1,19 @@
 <div <%== data_attributes %>>
   <% if render_header? %>
     <div class="<%= white_panel_classes %> p-4 flex-1 flex flex-col xl:flex-row justify-between mb-6">
-      <div class="overflow-hidden mr-4">
+      <div class="overflow-hidden mr-4 flex flex-col">
         <% if display_breadcrumbs? %>
           <div class="breadcrumbs truncate mb-2">
             <%= helpers.render_breadcrumbs(separator: helpers.svg('chevron-right', class: 'inline-block h-3 stroke-current relative top-[-1px] ml-1' )) if Avo.configuration.display_breadcrumbs %>
           </div>
         <% end %>
 
-        <div class="text-2xl tracking-normal font-semibold text-gray-800 truncate" data-target="title">
-          <%= @title %>
+        <div class="text-2xl tracking-normal font-semibold text-gray-800 truncate items-center flex flex-1" data-target="title">
+          <span><%= @title %></span>
         </div>
 
         <% if description.present? %>
-        <div class="text-base tracking-normal font-medium text-gray-600 truncate" data-target="description">
+        <div class="text-base tracking-normal font-medium text-gray-600" data-target="description">
           <%== description %>
         </div>
         <% end %>

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

@@ -13,7 +13,7 @@
             <%= t('avo.cancel').capitalize %>
           <% end %>
           <% if can_see_the_save_button? %>
-            <%= a_button color: :green, spinner: true, type: :submit, icon: 'save' do %>
+            <%= a_button color: :green, loading: true, type: :submit, icon: 'save' do %>
               <%= t('avo.save').capitalize %>
             <% end %>
           <% end %>
@@ -24,7 +24,7 @@
               <%= t('avo.cancel').capitalize %>
             <% end %>
             <% if can_see_the_save_button? %>
-              <%= a_button color: :green, spinner: true, type: :submit, icon: 'save' do %>
+              <%= a_button color: :green, loading: true, type: :submit, icon: 'save' do %>
                 <%= t('avo.save').capitalize %>
               <% end %>
             <% end %>

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

@@ -18,7 +18,7 @@
               <%= t('avo.cancel').capitalize %>
             <% end %>
             <% if can_see_the_save_button? %>
-              <%= a_button color: 'green', spinner: true, type: :submit, icon: 'save' do %>
+              <%= a_button color: 'green', loading: true, type: :submit, icon: 'save' do %>
                 <%= t('avo.save').capitalize %>
               <% end %>
             <% end %>
@@ -30,7 +30,7 @@
               <%= t('avo.cancel').capitalize %>
             <% end %>
             <% if can_see_the_save_button? %>
-              <%= a_button color: :green, spinner: true, type: :submit, icon: 'save' do %>
+              <%= a_button color: :green, loading: true, type: :submit, icon: 'save' do %>
                 <%= t('avo.save').capitalize %>
               <% end %>
             <% end %>

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

@@ -35,12 +35,12 @@
                 method: :delete,
                 local: true,
                 title: t('avo.delete_item', item: @resource.model.model_name.name.downcase).capitalize,
-                spinner: true,
+                loading: true,
+                confirm: t('avo.are_you_sure', item: @resource.model.model_name.name.downcase),
                 color: :red,
                 icon: 'trash',
                 form_class: 'flex flex-col sm:flex-row sm:inline-flex',
                 data: {
-                  confirm: t('avo.are_you_sure', item: @resource.model.model_name.name.downcase),
                   control: :destroy,
                   'resource-id': @resource.model.id,
                   'tippy': 'tooltip',

data/app/controllers/avo/base_controller.rb

@@ -44,7 +44,7 @@ module Avo
         unless @index_params[:sort_by].eql? :created_at
           @query = @query.unscope(:order)
         end
-        @query = @query.order(Arel.sql("#{@resource.model_class.table_name}.#{@index_params[:sort_by]} #{@index_params[:sort_direction]}"))
+        @query = @query.order("#{@resource.model_class.table_name}.#{@index_params[:sort_by]} #{@index_params[:sort_direction]}")
       end
 
       # Apply filters

data/app/javascript/js/controllers/loading_button_controller.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-alert */
 import { Controller } from '@hotwired/stimulus'
 
 export default class extends Controller {
@@ -6,17 +7,53 @@ export default class extends Controller {
   <div class="double-bounce2"></div>
 </div>`;
 
+  confirmed = false
+
   connect() {
-    const button = this.context.scope.element
-    this.context.scope.element.addEventListener('click', () => {
-      button.style.width = `${button.getBoundingClientRect().width}px`
-      button.style.height = `${button.getBoundingClientRect().height}px`
-      button.innerHTML = this.spinnerMarkup
-      button.classList.add('justify-center')
-
-      setTimeout(() => {
-        button.setAttribute('disabled', 'disabled')
-      }, 1)
+    this.context.scope.element.addEventListener('click', (e) => {
+      // If the user has to confirm the action
+      if (this.confirmationMessage) {
+        // Intervene only if not confirmed
+        if (!this.confirmed) {
+          e.preventDefault()
+          if (window.confirm(this.confirmationMessage)) {
+            this.applyLoader()
+          }
+        }
+      } else {
+        this.applyLoader()
+      }
     })
   }
+
+  get button() {
+    return this.context.scope.element
+  }
+
+  get confirmationMessage() {
+    return this.context.scope.element.getAttribute('data-avo-confirm')
+  }
+
+  applyLoader() {
+    const { button } = this
+
+    button.style.width = `${button.getBoundingClientRect().width}px`
+    button.style.height = `${button.getBoundingClientRect().height}px`
+    button.innerHTML = this.spinnerMarkup
+    button.classList.add('justify-center')
+
+    setTimeout(() => {
+      this.markConfirmed()
+      button.click()
+      button.setAttribute('disabled', 'disabled')
+    }, 1)
+  }
+
+  markConfirmed() {
+    this.confirmed = true
+  }
+
+  markUnconfirmed() {
+    this.confirmed = false
+  }
 }

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

@@ -88,6 +88,9 @@ export default class extends Controller {
     } else {
       Turbo.visit(item._url, { action: 'advance' })
     }
+
+    // On searchable belongs to the class `aa-Detached` remains on the body making it unscrollable
+    document.body.classList.remove('aa-Detached')
   }
 
   addSource(resourceName, data) {

data/app/views/avo/partials/_table_header.html.erb

@@ -1,10 +1,11 @@
-
 <thead class="bg-white border-b border-gray-200 pb-1">
-  <th class="rounded-lg">
-    <%== item_select_all_input %>
-  </th>
-  <%
-    fields.each_with_index do |field, index|
+  <% if @resource.record_selector %>
+    <th class="rounded-lg">
+      <%== item_select_all_input %>
+    </th>
+  <% end %>
+  <% fields.each_with_index do |field, index|  %>
+    <%
       if params[:sort_by] == field.id.to_s
         if params[:sort_direction] == 'asc'
           sort_by = nil
@@ -28,8 +29,7 @@
         sort_by = field.id
         sort_direction = 'desc'
       end
-      classes = "text-gray-500 tracking-tight leading-tight text-sm font-semibold"
-  %>
+      classes = "text-gray-500 tracking-tight leading-tight text-sm font-semibold" %>
     <th class="text-left uppercase px-3 py-4 whitespace-nowrap rounded-l">
       <% if field.sortable %>
         <%= link_to params.permit!.merge(sort_by: sort_by, sort_direction: sort_direction), class: "flex items-center #{classes} #{'cursor-pointer' if field.sortable}", 'data-turbo-frame': params[:turbo_frame] do %>
@@ -37,14 +37,13 @@
           <%= render partial: 'avo/partials/sortable_component', locals: {field: field} %>
         <% end %>
       <% else %>
-          <div class="flex items-center <%= classes %>">
-            <%= field.name %>
-          </div>
+        <div class="flex items-center <%= classes %>">
+          <%= field.name %>
+        </div>
       <% end %>
     </th>
   <% end %>
-
   <th class="w-24">
-    <!-- Controls cell -->
+    <!-- Item controls cell -->
   </th>
 </thead>

data/app/views/layouts/avo/application.html.erb

@@ -16,6 +16,9 @@
   <% else %>
     <%= javascript_include_tag "avo", "data-turbo-track": "reload", defer: true %>
     <%= stylesheet_link_tag "avo", "data-turbo-track": "reload", defer: true %>
+    <% if Rails.env.development? %>
+      <%= javascript_include_tag "hotwire-livereload", defer: true %>
+    <% end %>
   <% end %>
 </head>
 <body class="bg-application os-mac">

data/bin/helpers.rb

@@ -22,8 +22,14 @@ end
 
 def ask(question:, valid_answers: [])
   puts "\n#{question} (#{valid_answers.join('/')})"
+  # An uppercase option is treated as a default answer.  Otherwise, we disregard case, and always
+  # return the answer in lowercase.
+  default_answer = valid_answers.select { |val| val == val.upcase }.first&.downcase
 
-  input = gets.chomp
+  valid_answers.map!(&:downcase)
+
+  input = gets.downcase.chomp
+  input = default_answer if input == ''
 
   while !valid_answers.include?(input)
     puts 'Invalid input, please try again.'

data/bin/init

@@ -17,7 +17,7 @@ app_root do
   header 'Installing Yarn packages'
   run! 'yarn'
 
-  if use_docker
+  if use_docker == 'y'
     header 'Creating the Docker volume'
     run! 'docker volume create --name=avo-db-data'
 
@@ -28,7 +28,7 @@ app_root do
   header 'Preparing the database'
   run! 'bin/rails db:setup'
 
-  if use_docker
+  if use_docker == 'y'
     header 'Stopping the Docker image'
     run! 'docker-compose stop'
   end

data/lib/avo/base_resource.rb

@@ -43,6 +43,7 @@ module Avo
     class_attribute :after_create_path, default: :show
     class_attribute :after_update_path, default: :show
     class_attribute :invalid_fields
+    class_attribute :record_selector, default: true
 
     class << self
       delegate :t, to: ::I18n
@@ -285,9 +286,6 @@ module Avo
     end
 
     def name
-      # return 'hwhwhw'
-
-
       default = class_name_without_resource.titlecase
 
       return @name if @name.present?

data/lib/avo/dynamic_router.rb

@@ -1,7 +1,7 @@
 module Avo
   module DynamicRouter
     def self.routes(router)
-      Rails.application.eager_load! if Rails.env.development?
+      Rails.application.eager_load! unless Rails.env.production?
 
       BaseResource.descendants
         .select do |resource|

data/lib/avo/engine.rb

@@ -19,7 +19,6 @@ module Avo
 
     config.i18n.load_path += Dir[Avo::Engine.root.join('lib', 'generators', 'avo', 'templates', 'locales', '*.{rb,yml}')]
 
-    # initializer "avo.autoload", before: :set_autoload_paths do |app|
     initializer "avo.autoload" do |app|
       [
         ["app", "avo", "fields"],

data/lib/avo/fields/belongs_to_field.rb

@@ -61,6 +61,7 @@ module Avo
       attr_reader :polymorphic_as
       attr_reader :relation_method
       attr_reader :types # for Polymorphic associations
+      attr_reader :allow_via_detaching
 
       def initialize(id, **args, &block)
         args[:placeholder] ||= I18n.t("avo.choose_an_option")
@@ -71,6 +72,7 @@ module Avo
         @polymorphic_as = args[:polymorphic_as]
         @types = args[:types]
         @relation_method = id.to_s.parameterize.underscore
+        @allow_via_detaching = args[:allow_via_detaching] == true
       end
 
       def searchable

data/lib/avo/reloader.rb

@@ -3,31 +3,31 @@ class Avo::Reloader
 
   def reload!
     # reload all files declared in paths
-    paths.each { |path| load path }
+    files.each { |file| load file }
 
     # reload all files declared in each directory
     directories.keys.each do |dir|
-      Dir.glob("#{dir}/**/*.rb".to_s).each { |c| load c }
+      Dir.glob("#{dir}/**/*.rb".to_s).each { |file| load file }
     end
   end
 
   private
     def updater
-      @updater ||= config.file_watcher.new(paths, directories) { reload! }
+      @updater ||= config.file_watcher.new(files, directories) { reload! }
     end
 
-    def paths
+    def files
       # we want to watch some files no matter what
-      files = [
+      paths = [
         Rails.root.join("config", "initializers", "avo.rb"),
       ]
 
       # we want to watch some files only in Avo development
       if reload_lib?
-        files += []
+        paths += []
       end
 
-      files
+      paths
     end
 
     def directories

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "2.1.2.pre2"
+  VERSION = "2.2.0"
 end

data/public/avo-assets/avo.css

@@ -8484,8 +8484,8 @@ trix-editor {
   opacity:0.5
 }
 
-.disabled\:opacity-30:disabled{
-  opacity:0.3
+.disabled\:opacity-70:disabled{
+  opacity:0.7
 }
 
 .group:hover .group-hover\:block{