avo 2.13.5.pre.2 → 2.14.0

data/app/javascript/js/controllers/item_select_all_controller.js

@@ -1,21 +1,59 @@
 import { Controller } from '@hotwired/stimulus'
 
 export default class extends Controller {
-  static targets = ['itemCheckbox', 'checkbox']
+  static targets = ['itemCheckbox', 'checkbox', 'selectAllOvelay', 'unselectedMessage', 'selectedMessage']
+
+  static values = {
+    selectedAll: Boolean,
+    selectedAllQuery: String,
+  }
 
   connect() {
     this.resourceName = this.element.dataset.resourceName
   }
 
   toggle(event) {
-    const value = !!event.target.checked
+    const checked = !!event.target.checked
     document.querySelectorAll(`[data-controller="item-selector"][data-resource-name="${this.resourceName}"] input[type=checkbox]`)
-      .forEach((checkbox) => checkbox.checked != value && checkbox.click())
+      .forEach((checkbox) => checkbox.checked !== checked && checkbox.click())
+
+    this.selectAllOverlay(checked)
+
+    // When de-selecting everything, ensure the selectAll toggle is false and hide overlay.
+    if (!checked) {
+      this.resetUnselected()
+    }
   }
 
-  update() {
+  selectRow() {
     let allSelected = true
+    // eslint-disable-next-line no-return-assign
     this.itemCheckboxTargets.forEach((checkbox) => allSelected = allSelected && checkbox.checked)
     this.checkboxTarget.checked = allSelected
+
+    this.selectAllOverlay(allSelected)
+    this.resetUnselected()
+  }
+
+  selectAll(event) {
+    event.preventDefault()
+
+    this.selectedAllValue = !this.selectedAllValue
+    this.unselectedMessageTarget.classList.toggle('hidden')
+    this.selectedMessageTarget.classList.toggle('hidden')
+  }
+
+  resetUnselected() {
+    this.selectedAllValue = false
+    this.unselectedMessageTarget.classList.remove('hidden')
+    this.selectedMessageTarget.classList.add('hidden')
+  }
+
+  selectAllOverlay(show) {
+    if (show) {
+      this.selectAllOvelayTarget.classList.remove('hidden')
+    } else {
+      this.selectAllOvelayTarget.classList.add('hidden')
+    }
   }
 }

data/app/javascript/js/controllers/tabs_controller.js

@@ -3,7 +3,7 @@ import { Controller } from '@hotwired/stimulus'
 import { castBoolean } from '../helpers/cast_boolean'
 
 export default class extends Controller {
-  static targets = ['tab'];
+  static targets = ['tabPanel'];
 
   static values = {
     view: String,
@@ -11,13 +11,17 @@ export default class extends Controller {
   };
 
   get currentTab() {
-    return this.tabTargets.find(
+    return this.tabPanelTargets.find(
       (element) => element.dataset.tabId === this.activeTabValue,
     )
   }
 
   targetTab(id) {
-    return this.tabTargets.find((element) => element.dataset.tabId === id)
+    return this.tabTargets.find((element) => element.dataset.tabsIdParam === id)
+  }
+
+  targetTabPanel(id) {
+    return this.tabPanelTargets.find((element) => element.dataset.tabId === id)
   }
 
   changeTab(e) {
@@ -46,17 +50,17 @@ export default class extends Controller {
     }
 
     // We don't need to add a height to this panel because it was loaded before
-    if (castBoolean(this.targetTab(id).dataset.loaded)) {
+    if (castBoolean(this.targetTabPanel(id).dataset.loaded)) {
       return
     }
 
     // Get the height of the active panel
     const { height } = this.currentTab.getBoundingClientRect()
     // Set it to the target panel
-    this.targetTab(id).style.height = `${height}px`
+    this.targetTabPanel(id).style.height = `${height}px`
 
     // Wait until the panel loaded it's content and then remove the forced height
-    const observer = new AttributeObserver(this.targetTab(id), 'busy', {
+    const observer = new AttributeObserver(this.targetTabPanel(id), 'busy', {
       elementUnmatchedAttribute: () => {
         // The content is not available in an instant so delay the height reset a bit.
         setTimeout(() => {
@@ -69,11 +73,11 @@ export default class extends Controller {
   }
 
   markTabLoaded(id) {
-    this.targetTab(id).dataset.loaded = true
+    this.targetTabPanel(id).dataset.loaded = true
   }
 
   showTab(id) {
-    this.tabTargets.forEach((element) => {
+    this.tabPanelTargets.forEach((element) => {
       if (element.dataset.tabId === id) {
         element.classList.remove('hidden')
       }
@@ -81,6 +85,6 @@ export default class extends Controller {
   }
 
   hideTabs() {
-    this.tabTargets.map((element) => element.classList.add('hidden'))
+    this.tabPanelTargets.map((element) => element.classList.add('hidden'))
   }
 }

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

@@ -20,7 +20,8 @@
       <div class="flex-1 flex">
         <%= @action.message %>
       </div>
-      <%= form.hidden_field :resource_ids, value: params[:resource_ids], 'data-action-target': 'resourceIds' %>
+      <%= form.hidden_field :avo_resource_ids, value: params[:resource_ids], 'data-action-target': 'resourceIds' %>
+      <%= form.hidden_field :avo_selected_query, 'data-action-target': 'selectedAllQuery' %>
       <% if @action.get_fields.present? %>
         <div class="mt-4">
           <% @action.get_fields.each_with_index do |field, index| %>

data/app/views/avo/base/index.html.erb

@@ -12,6 +12,7 @@
       parent_model: @parent_model,
       parent_resource: @parent_resource,
       applied_filters: @applied_filters,
+      query: @query,
     )
   %>
 <% end %>

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

@@ -44,7 +44,7 @@
           ""
         end
     %>
-    <th class="text-left uppercase px-3 py-2 whitespace-nowrap rounded-l" data-control="resource-field-th">
+    <th class="text-left uppercase px-3 py-3 whitespace-nowrap rounded-l" data-control="resource-field-th">
       <% 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 %>
           <%= field.name %>

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

@@ -20,10 +20,10 @@
 
         <%= a_link url_for(params.permit!.merge(view_type: type)).to_s,
           icon: info[type][:new_icon],
-          color: is_active_view ? :gray : :primary,
+          color: is_active_view ? :primary : :gray,
           rounded: false,
           size: :sm,
-          class: is_active_view ? ' bg-gray-100 border-gray-300' : ' z-20',
+          class: is_active_view ? "z-20" : "bg-gray-100 border-gray-300",
           title: t('avo.switch_to_view', view_type: type),
           data: {
             tippy: 'tooltip',

data/lib/avo/base_resource.rb

@@ -20,6 +20,7 @@ module Avo
     delegate :context, to: ::Avo::App
 
     attr_accessor :view
+    attr_accessor :model
     attr_accessor :reflection
     attr_accessor :user
     attr_accessor :params
@@ -110,11 +111,6 @@ module Avo
       end
     end
 
-    def record
-      @model
-    end
-    alias :model :record
-
     def hydrate(model: nil, view: nil, user: nil, params: nil)
       @view = view if view.present?
       @user = user if user.present?

data/lib/avo/concerns/fetches_things.rb

@@ -51,15 +51,10 @@ module Avo
         #
         # get_resource_by_name('User') => UserResource
         # get_resource_by_name(User) => UserResource
-        def get_resource_by_model_name(klass)
-          # Fetch the mappings imposed by the user.
-          # If they are present, use those ones.
-          mapping = get_mapping_for_model klass
-          return get_resource(mapping) if mapping.present?
-
+        def get_resource_by_model_name(name)
           valid_resources
             .find do |resource|
-              resource.model_class.model_name.name == klass.to_s
+              resource.model_class.model_name.name == name.to_s
             end
         end
 
@@ -133,12 +128,6 @@ module Avo
 
           get_sidebar_partials
         end
-
-        private
-
-        def get_mapping_for_model(klass)
-          (Avo.configuration.model_resource_mapping || {}).stringify_keys.transform_values(&:to_s)[klass.to_s]
-        end
       end
     end
   end

data/lib/avo/concerns/has_fields.rb

@@ -26,10 +26,10 @@ module Avo
           items_holder.panel name, **args, &block
         end
 
-        def tabs(&block)
+        def tabs(**args, &block)
           ensure_items_holder_initialized
 
-          items_holder.tabs Avo::TabGroupBuilder.parse_block(&block)
+          items_holder.tabs Avo::TabGroupBuilder.parse_block(**args, &block)
         end
 
         def tool(klass, **args)

data/lib/avo/configuration.rb

@@ -34,7 +34,7 @@ module Avo
     attr_accessor :buttons_on_form_footers
     attr_accessor :main_menu
     attr_accessor :profile_menu
-    attr_accessor :model_resource_mapping
+    attr_accessor :tabs_style
 
     def initialize
       @root_path = "/avo"
@@ -79,7 +79,7 @@ module Avo
       @buttons_on_form_footers = false
       @main_menu = nil
       @profile_menu = nil
-      @model_resource_mapping = {}
+      @tabs_style = :tabs
     end
 
     def current_user_method(&block)

data/lib/avo/fields/base_field.rb

@@ -61,7 +61,7 @@ module Avo
         @name = args[:name]
         @translation_key = args[:translation_key]
         @block = block
-        @required = args[:required] || false
+        @required = args.dig(:required) # Value if :required present on args, nil otherwise
         @readonly = args[:readonly] || false
         @sortable = args[:sortable] || false
         @nullable = args[:nullable] || false

data/lib/avo/fields/concerns/is_required.rb

@@ -8,9 +8,23 @@ module Avo
           if required.respond_to? :call
             Avo::Hosts::ViewRecordHost.new(block: required, record: model, view: view).handle
           else
-            required
+            required.nil? ? required_from_validators : required
           end
         end
+
+        private
+
+        def required_from_validators
+          return false if model.nil?
+
+          validators.any? do |validator|
+            validator.kind_of? ActiveModel::Validations::PresenceValidator
+          end
+        end
+
+        def validators
+          model.class.validators_on(id)
+        end
       end
     end
   end

data/lib/avo/services/encryption_service.rb

@@ -0,0 +1,33 @@
+module Avo
+  module Services
+    class EncryptionService
+      attr_reader :message
+      attr_reader :purpose
+      attr_reader :crypt
+
+      class << self
+        def encrypt(message:, purpose:)
+          new(message: message, purpose: purpose).encrypt
+        end
+
+        def decrypt(message:, purpose:)
+          new(message: message, purpose: purpose).decrypt
+        end
+      end
+
+      def initialize(message:, purpose:)
+        @message = message
+        @purpose = purpose
+        @crypt = ActiveSupport::MessageEncryptor.new(Rails.application.secrets.secret_key_base[0..31])
+      end
+
+      def encrypt
+        crypt.encrypt_and_sign(message, purpose: purpose)
+      end
+
+      def decrypt
+        crypt.decrypt_and_verify(message, purpose: purpose)
+      end
+    end
+  end
+end

data/lib/avo/tab_group.rb

@@ -7,11 +7,13 @@ class Avo::TabGroup
   attr_reader :view
   attr_accessor :index
   attr_accessor :items_holder
+  attr_accessor :style
 
-  def initialize(index: 0, view: nil)
+  def initialize(index: 0, view: nil, style: nil)
     @index = index
     @items_holder = Avo::ItemsHolder.new
     @view = view
+    @style = style
   end
 
   def hydrate(view: nil)

data/lib/avo/tab_group_builder.rb

@@ -1,7 +1,7 @@
 class Avo::TabGroupBuilder
   class << self
-    def parse_block(&block)
-      Docile.dsl_eval(new, &block).build
+    def parse_block(**args, &block)
+      Docile.dsl_eval(new(**args), &block).build
     end
   end
 
@@ -9,8 +9,8 @@ class Avo::TabGroupBuilder
 
   delegate :tab, to: :items_holder
 
-  def initialize
-    @group = Avo::TabGroup.new
+  def initialize(style: nil)
+    @group = Avo::TabGroup.new(style: style)
     @items_holder = Avo::ItemsHolder.new
   end
 

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "2.13.5.pre.2" unless const_defined?(:VERSION)
+  VERSION = "2.14.0" unless const_defined?(:VERSION)
 end

data/lib/generators/avo/templates/initializer/avo.tt

@@ -34,27 +34,26 @@ Avo.configure do |config|
   ## == Localization ==
   # config.locale = 'en-US'
 
-  ## == Resource options ==
-  # config.resource_controls = :right
-  # config.model_resource_mapping = {}
-  # config.default_view_type = :table
-  # config.per_page = 24
-  # config.per_page_steps = [12, 24, 48, 72]
-  # config.via_per_page = 8
-  # config.id_links_to_resource = false
-  # config.cache_resources_on_index_view = true
-
   ## == Customization ==
   # config.app_name = 'Avocadelicious'
   # config.timezone = 'UTC'
   # config.currency = 'USD'
+  # config.per_page = 24
+  # config.per_page_steps = [12, 24, 48, 72]
+  # config.via_per_page = 8
+  # config.default_view_type = :table
   # config.hide_layout_when_printing = false
+  # config.id_links_to_resource = false
   # config.full_width_container = false
   # config.full_width_index_view = false
+  # config.cache_resources_on_index_view = true
   # config.search_debounce = 300
   # config.view_component_path = "app/components"
   # config.display_license_request_timeout_error = true
   # config.disabled_features = []
+  # config.resource_controls = :right
+  # config.tabs_style = :tabs # can be :tabs or :pills
+
 
   ## == Breadcrumbs ==
   # config.display_breadcrumbs = true

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

@@ -23,7 +23,9 @@ en:
     you_missed_something_check_form: 'You might have missed something. Please check the form.'
     remove_selection: 'Remove selection'
     select_item: 'Select item'
-    select_all: 'Select all on page'
+    select_all: 'Select all'
+    select_all_matching: 'Select all matching'
+    undo: undo
     delete_file: 'Delete file'
     delete: 'delete'
     delete_item: 'Delete %{item}'
@@ -113,3 +115,5 @@ en:
     empty_dashboard_message: Add cards to this dashboard
     no_cards_present: No cards present
     no_options_available: No options available
+    x_records_selected_from_a_total_of_x_html: <span class="font-bold text-gray-700">%{selected}</span> records selected on this page from a total of <span class="font-bold text-gray-700">%{count}</span>
+    x_records_selected_from_all_pages_html: <span class="font-bold text-gray-700">%{count}</span> records selected from all pages

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

@@ -24,6 +24,8 @@ fr:
     remove_selection: 'Supprimer la sélection'
     select_item: 'Sélectionnez un élément'
     select_all: 'Sélectionner tout sur la page'
+    select_all_matching: 'Sélectionner toutes les correspondances'
+    undo: annuler
     delete_file: 'Supprimer le fichier'
     delete: 'supprimer'
     delete_item: 'Supprimer %{item}'
@@ -113,3 +115,5 @@ fr:
     empty_dashboard_message: Ajouter des cartes à ce tableau de bord
     no_cards_present: Aucune carte présente
     no_options_available: Aucune option disponible
+    x_records_selected_from_a_total_of_x_html: <span class="font-bold text-gray-700">%{selected}</span> enregistrements sélectionnés sur cette page sur un total de <span class="font-bold text-gray-700">%{count}</span>
+    x_records_selected_from_all_pages_html: <span class="font-bold text-gray-700">%{count}</span> enregistrements sélectionnés dans toutes les pages

data/lib/generators/avo/templates/locales/avo.nb-NO.yml

@@ -23,6 +23,9 @@ nb-NO:
     you_missed_something_check_form: 'Her mangler du noe. Vennligst sjekk skjemaet.'
     remove_selection: 'Fjern valg'
     select_item: 'Velg'
+    select_all: 'Velg alle'
+    select_all_matching: 'Velg alle samsvarende'
+    undo: angre
     delete_file: 'Slett fil'
     delete: 'slett'
     delete_item: 'Slett %{item}'
@@ -85,4 +88,6 @@ nb-NO:
     empty_dashboard_message: Legg til kort i dette dashbordet
     no_cards_present: Ingen kort til stede
     no_options_available: Ingen tilgjengelige alternativer
+    x_records_selected_from_a_total_of_x_html: <span class="font-bold text-gray-700">%{selected}</span> poster valgt på denne siden fra totalt <span class="font-bold text-gray-700">%{count}</span>
+    x_records_selected_from_all_pages_html: <span class="font-bold text-gray-700">%{count}</span> poster valgt fra alle sider
 

data/lib/generators/avo/templates/locales/avo.pt-BR.yml

@@ -23,6 +23,9 @@ pt-BR:
     you_missed_something_check_form: 'Você pode ter esquecido algo. Por favor, cheque o formulário.'
     remove_selection: 'Remover seleção'
     select_item: 'Selecionar item'
+    select_all: 'Selecionar tudo'
+    select_all_matching: 'Selecione todas as correspondências'
+    undo: desfazer
     delete_file: 'Deletar arquivo'
     delete: 'deletar'
     delete_item: 'Deletar %{item}'
@@ -87,3 +90,5 @@ pt-BR:
     empty_dashboard_message: Adicionar cartões a este painel
     no_cards_present: Nenhum cartão presente
     no_options_available: Nenhuma opção disponível
+    x_records_selected_from_a_total_of_x_html: <span class="font-bold text-gray-700">%{selected}</span> registros selecionados nesta página de um total de <span class="font-bold text-gray-700">%{count}</span>
+    x_records_selected_from_all_pages_html: <span class="font-bold text-gray-700">%{count}</span> registros selecionados de todas as páginas

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

@@ -16,6 +16,10 @@ ro:
     resource_created: 'Resursa creata'
     resource_destroyed: 'Resursa stearsa'
     remove_selection: 'Sterge selectia'
+    select_item: 'Selecteaza record'
+    select_all: 'Selecteaza totul'
+    select_all_matching: 'Selecteaza toate care se potrivesc'
+    undo: Anuleaza
     delete_file: 'Sterge fisierul'
     delete: 'sterge'
     delete_item: 'Sterge %{item}'
@@ -83,3 +87,5 @@ ro:
     empty_dashboard_message: Adauga carduri in acest dashboard
     no_cards_present: Niciun card disponibil
     no_options_available: Nicio optiune disponibila
+    x_records_selected_from_a_total_of_x_html: <span class="font-bold text-gray-700">%{selected}</span> selectate dintr-un total de <span class="font-bold text-gray-700">%{count}</span>
+    x_records_selected_from_all_pages_html: <span class="font-bold text-gray-700">%{count}</span> selectate din toate paginile

data/public/avo-assets/avo.css

@@ -6315,6 +6315,10 @@ trix-editor .attachment__metadata .attachment__size {
   top:-1px
 }
 
+.-top-\[0\.1rem\]{
+  top:-0.1rem
+}
+
 .right-3{
   right:0.75rem
 }
@@ -6527,6 +6531,26 @@ trix-editor .attachment__metadata .attachment__size {
   margin-left:50%
 }
 
+.ml-10{
+  margin-left:2.5rem
+}
+
+.mt-0\.5{
+  margin-top:0.125rem
+}
+
+.mt-0{
+  margin-top:0px
+}
+
+.mt-1\.5{
+  margin-top:0.375rem
+}
+
+.ml-2{
+  margin-left:0.5rem
+}
+
 .mr-0\.5{
   margin-right:0.125rem
 }
@@ -6547,10 +6571,6 @@ trix-editor .attachment__metadata .attachment__size {
   margin-bottom:-0.5rem
 }
 
-.mt-0{
-  margin-top:0px
-}
-
 .mt-6{
   margin-top:1.5rem
 }
@@ -6687,6 +6707,10 @@ trix-editor .attachment__metadata .attachment__size {
   height:2.5rem
 }
 
+.h-9{
+  height:2.25rem
+}
+
 .max-h-\[42rem\]{
   max-height:42rem
 }
@@ -6795,6 +6819,14 @@ trix-editor .attachment__metadata .attachment__size {
   min-width:20px
 }
 
+.min-w-\[2rem\]{
+  min-width:2rem
+}
+
+.min-w-\[6rem\]{
+  min-width:6rem
+}
+
 .max-w-168{
   max-width:42rem
 }
@@ -7723,6 +7755,10 @@ trix-editor .attachment__metadata .attachment__size {
   padding-bottom:75%
 }
 
+.pt-px{
+  padding-top:1px
+}
+
 .pr-2{
   padding-right:0.5rem
 }
@@ -9181,6 +9217,10 @@ trix-editor {
   outline-width:1px
 }
 
+.active\:outline-0:active{
+  outline-width:0px
+}
+
 .active\:outline-slate-500:active{
   outline-color:#64748b
 }