avo 2.5.1 → 2.5.2.pre.3

data/app/controllers/avo/base_controller.rb

@@ -11,8 +11,8 @@ module Avo
     before_action :set_edit_title_and_breadcrumbs, only: [:edit, :update]
     before_action :fill_model, only: [:create, :update]
     before_action :authorize_action
-    before_action :reset_pagination_if_filters_changed, only: :index
-    before_action :cache_applied_filters, only: :index
+    # before_action :reset_pagination_if_filters_changed, only: :index
+    # before_action :cache_applied_filters, only: :index
 
     def index
       @page_title = @resource.plural_name.humanize
@@ -49,10 +49,10 @@ module Avo
         # Check if the sortable field option is actually a proc and we need to do a custom sort
         field_id = @index_params[:sort_by].to_sym
         field = @resource.get_field_definitions.find { |field| field.id == field_id }
-        if field&.sortable.is_a?(Proc)
-          @query = field.sortable.call(@query, @index_params[:sort_direction])
+        @query = if field&.sortable.is_a?(Proc)
+          field.sortable.call(@query, @index_params[:sort_direction])
         else
-          @query = @query.order("#{@resource.model_class.table_name}.#{@index_params[:sort_by]} #{@index_params[:sort_direction]}")
+          @query.order("#{@resource.model_class.table_name}.#{@index_params[:sort_by]} #{@index_params[:sort_direction]}")
         end
       end
 
@@ -61,7 +61,14 @@ module Avo
         @query = filter_class.safe_constantize.new.apply_query request, @query, filter_value
       end
 
-      @pagy, @models = pagy(@query, items: @index_params[:per_page], link_extra: "data-turbo-frame=\"#{params[:turbo_frame]}\"", size: [1, 2, 2, 1])
+      extra_pagy_params = {}
+
+      # Reset open filters when a user navigates to a new page
+      extra_pagy_params[:keep_filters_panel_open] = if params[:keep_filters_panel_open] == "1"
+        "0"
+      end
+
+      @pagy, @models = pagy(@query, items: @index_params[:per_page], link_extra: "data-turbo-frame=\"#{params[:turbo_frame]}\"", size: [1, 2, 2, 1], params: extra_pagy_params)
 
       # Create resources for each model
       @resources = @models.map do |model|
@@ -354,19 +361,21 @@ module Avo
     end
 
     # Caching these so we know when the filters have changed so we reset the pagination
-    def cache_applied_filters
-      ::Avo::App.cache_store.delete applied_filters_cache_key if params[:filters].nil?
+    # def cache_applied_filters
+    #   # puts ["Rails.session->", session].inspect
+    #   session[:avo_applied_filters] = params[:filters]
+    #   # ::Avo::App.cache_store.delete(applied_filters_cache_key) if params[:filters].nil?
 
-      ::Avo::App.cache_store.write(applied_filters_cache_key, params[:filters], expires_in: 1.day)
-    end
+    #   # ::Avo::App.cache_store.write(applied_filters_cache_key, params[:filters], expires_in: 1.day)
+    # end
 
-    def reset_pagination_if_filters_changed
-      params[:page] = 1 if params[:filters] != ::Avo::App.cache_store.read(applied_filters_cache_key)
-    end
+    # def reset_pagination_if_filters_changed
+    #   params[:page] = 1 if params[:filters] != session[:avo_applied_filters]
+    # end
 
-    def applied_filters_cache_key
-      "avo.base_controller.#{@resource.model_key}.applied_filters"
-    end
+    # def applied_filters_cache_key
+    #   "avo.base_controller.#{@resource.model_key}.applied_filters"
+    # end
 
     def set_edit_title_and_breadcrumbs
       @resource = @resource.hydrate(model: @model, view: :edit, user: _current_user)

data/app/helpers/avo/application_helper.rb

@@ -118,7 +118,7 @@ module Avo
     end
 
     def input_classes(extra_classes = "", has_error: false)
-      classes = "appearance-none inline-flex bg-gray-100 disabled:cursor-not-allowed text-gray-600 disabled:opacity-50 rounded py-2 px-3 leading-tight border focus:border-gray-600 focus-visible:ring-0 focus:text-gray-700"
+      classes = "appearance-none inline-flex bg-gray-25 disabled:cursor-not-allowed text-gray-600 disabled:opacity-50 rounded py-2 px-3 leading-tight border focus:border-gray-600 focus-visible:ring-0 focus:text-gray-700"
 
       classes += if has_error
         " border-red-600"

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

@@ -110,7 +110,7 @@ export default class extends Controller {
 
   inputField(id = 'key', index, key, value) {
     return `<input
-  class="${this.options.inputClasses} !rounded-none border-gray-600 border-r border-l-0 border-b-0 border-t-0 focus:border-gray-300 w-1/2 focus:outline-none outline-none key-value-input-${id}"
+  class="${this.options.inputClasses} focus:bg-gray-100 !rounded-none border-gray-600 border-r border-l-0 border-b-0 border-t-0 focus:border-gray-300 w-1/2 focus:outline-none outline-none key-value-input-${id}"
   data-action="input->key-value#${id}FieldUpdated"
   placeholder="${this.options[`${id}_label`]}"
   data-index="${index}"

data/app/javascript/js/controllers/filter_controller.js

@@ -84,9 +84,12 @@ export default class extends Controller {
 
     if (this.keepFiltersPanelOpenValue) {
       // eslint-disable-next-line camelcase
-      query.keep_filters_panel_open = this.keepFiltersPanelOpenValue
+      query.keep_filters_panel_open = this.keepFiltersPanelOpenValue ? 1 : null
     }
 
+    // force to go to the first page if the filters changed
+    query.page = 1
+
     if (encodedFilters) {
       query.filters = encodedFilters
     } else {

data/app/javascript/js/controllers.js

@@ -2,7 +2,6 @@ import { application } from './application'
 
 import ActionController from './controllers/action_controller'
 import ActionsPickerController from './controllers/actions_picker_controller'
-import AlertsController from './controllers/alerts_controller'
 import AttachmentsController from './controllers/attachments_controller'
 import BelongsToFieldController from './controllers/fields/belongs_to_field_controller'
 import BooleanFilterController from './controllers/boolean_filter_controller'
@@ -32,7 +31,6 @@ import TrixFieldController from './controllers/fields/trix_field_controller'
 
 application.register('action', ActionController)
 application.register('actions-picker', ActionsPickerController)
-application.register('alerts', AlertsController)
 application.register('attachments', AttachmentsController)
 application.register('boolean-filter', BooleanFilterController)
 application.register('copy-to-clipboard', CopyToClipboardController)

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

@@ -29,11 +29,14 @@
         </div>
       <% end %>
       <% c.controls do %>
-        <%= a_button data: { action: 'click->modal#close' }, size: :sm do %>
+        <%= a_button data: { action: 'click->modal#close' },
+          size: :sm,
+          color: :primary do %>
           <%= @action.cancel_button_label %>
         <% end %>
         <%= a_button type: :submit,
-            color: :green,
+            color: :primary,
+            style: :primary,
             size: :sm,
             data: @action.class.submit_button_data_attributes do %>
           <%= @action.confirm_button_label %>

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

@@ -1,3 +1,3 @@
-<%= link_to root_path, class: 'logo-placeholder h-20 bg-white p-4 flex justify-start' do %>
+<%= link_to root_path, class: 'logo-placeholder h-10 bg-white flex justify-start' do %>
   <%= image_tag '/avo-assets/logo.png', class: 'h-full', title: 'Avo' %>
 <% end %>

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

@@ -1,14 +1,20 @@
 <div
-  class="relative bg-white p-2 w-full flex flex-shrink-0 items-center z-50 px-4 lg:px-8 border-b space-x-4 lg:space-x-0 min-h-[4rem] <%= 'print:hidden' if Avo.configuration.hide_layout_when_printing %>"
+  class="fixed bg-white p-2 w-full flex flex-shrink-0 items-center z-50 px-4 lg:px-4 border-b space-x-4 lg:space-x-0 min-h-[4rem] <%= 'print:hidden' if Avo.configuration.hide_layout_when_printing %>"
   v-if="layout !== 'blank'"
 >
-  <%= a_button class: 'lg:hidden', icon: 'menu', data: { action: 'click->mobile#toggleSidebar' } %>
-  <div class="flex-1 flex items-center justify-between lg:justify-start space-x-8">
-    <div class="m-0">
-      <%= render partial: "avo/partials/header" %>
-    </div>
+  <div class="flex items-center space-x-2 lg:space-x-0 w-64">
+    <%= a_button class: 'lg:hidden', icon: 'menu', size: :xs, compact: true, style: :text, data: { action: 'click->mobile#toggleSidebar' } %>
+
+    <%= render partial: "avo/partials/logo" %>
+  </div>
+
+
+  <div class="flex-1 flex items-center justify-between lg:justify-start space-x-8 pl-4">
     <div class="flex">
       <%= render partial: "avo/partials/global_search" if ::Avo::App.license.has_with_trial(:global_search) && ::Avo.configuration.feature_enabled?(:global_search) %>
     </div>
+    <div class="m-0">
+      <%= render partial: "avo/partials/header" %>
+    </div>
   </div>
 </div>

data/app/views/avo/private/_links_and_buttons.html.erb

@@ -1,7 +1,7 @@
 <%
   entities = [:button, :link]
   sizes = [:lg, :md, :sm, :xs]
-  styles = [:primary, :outline]
+  styles = [:primary, :outline, :text]
   colors = [:primary, :gray, :red, :orange, :green]
   states = [:regular, :hover, :disabled, :active]
 %>

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

@@ -1,60 +1,54 @@
 <!DOCTYPE html>
 <html>
-<head>
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <%= display_meta_tags site: Avo.configuration.app_name, reverse: true, separator: "—" %>
-
-  <%= csrf_meta_tags %>
-  <%= csp_meta_tag %>
-
-  <%= render partial: 'avo/partials/javascript' %>
-  <%= render partial: 'avo/partials/head' %>
-
-  <% if Avo::PACKED %>
-    <%= javascript_include_tag "/avo-assets/avo", "data-turbo-track": "reload", defer: true %>
-    <%= stylesheet_link_tag "/avo-assets/avo", "data-turbo-track": "reload", defer: true %>
-  <% 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 %>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <%= display_meta_tags site: Avo.configuration.app_name, reverse: true, separator: "—" %>
+    <%= csrf_meta_tags %>
+    <%= csp_meta_tag %>
+    <%= render partial: 'avo/partials/javascript' %>
+    <%= render partial: 'avo/partials/head' %>
+    <% if Avo::PACKED %>
+      <%= javascript_include_tag "/avo-assets/avo", "data-turbo-track": "reload", defer: true %>
+      <%= stylesheet_link_tag "/avo-assets/avo", "data-turbo-track": "reload", defer: true %>
+    <% 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 %>
-  <% end %>
-</head>
-<body class="bg-application os-mac">
-<div class="relative flex flex-1 w-full min-h-full" data-controller="mobile">
-  <%= render Avo::SidebarComponent.new %>
-
-  <div class="lg:pl-64 flex-1 flex flex-col min-h-full max-w-full">
-    <%= render partial: "avo/partials/navbar" %>
-
-    <div class="content py-4 lg:py-8 px-4 lg:px-8 flex-1 flex flex-col justify-between items-stretch <%= @container_classes %>">
-      <%= render partial: "avo/partials/custom_tools_alert" if @custom_tools_alert_visible %>
-
-      <div class="flex flex-1 flex-col justify-between items-stretch space-y-8">
-        <%= yield %>
-        <%= render partial: "avo/partials/footer" %>
+  </head>
+  <body class="bg-gray-25 os-mac">
+    <div class="relative flex flex-1 w-full min-h-full" data-controller="mobile">
+      <div class="flex-1 flex flex-col max-w-full">
+        <%= render partial: "avo/partials/navbar" %>
+        <div class="flex-1 flex pt-16 relative">
+          <%= render Avo::SidebarComponent.new %>
+          <div class="lg:pl-64 flex-1 flex flex-col min-h-full max-w-full">
+            <div class="content py-4 lg:py-8 px-4 lg:px-8 flex-1 flex flex-col justify-between items-stretch <%= @container_classes %>">
+              <%= render partial: "avo/partials/custom_tools_alert" if @custom_tools_alert_visible %>
+              <div class="flex flex-1 flex-col justify-between items-stretch space-y-8">
+                <%= yield %>
+                <%= render partial: "avo/partials/footer" %>
+              </div>
+            </div>
+          </div>
+        </div>
       </div>
     </div>
-  </div>
-</div>
-
-<%= turbo_frame_tag 'actions_show' %>
-<%= turbo_frame_tag 'attach_modal' %>
-<%= turbo_frame_tag 'destroy_attachment_form' %>
-
-<%= turbo_frame_tag 'alerts', class: "fixed inset-0 bottom-0 flex flex-col space-y-4 items-end justify-right px-4 py-6 sm:p-6 justify-end z-50 pointer-events-none" do %>
-  <%= render Avo::FlashAlertsComponent.new flashes: flash %>
-
-  <% # In case we have other general error messages %>
-  <% if @errors.present? %>
-    <% @errors.each do |message| %>
-      <%= render Avo::AlertComponent.new :error, message %>
+    <%= turbo_frame_tag 'actions_show' %>
+    <%= turbo_frame_tag 'attach_modal' %>
+    <%= turbo_frame_tag 'destroy_attachment_form' %>
+    <%= turbo_frame_tag 'alerts', class: "fixed inset-0 bottom-0 flex flex-col space-y-4 items-end justify-right px-4 py-6 sm:p-6 justify-end z-50 pointer-events-none" do %>
+      <%= render Avo::FlashAlertsComponent.new flashes: flash %>
+      <% # In case we have other general error messages %>
+      <% if @errors.present? %>
+        <% @errors.each do |message| %>
+          <%= render Avo::AlertComponent.new :error, message %>
+        <% end %>
+      <% end %>
     <% end %>
-  <% end %>
-<% end %>
-
-<%= render partial: "avo/partials/scripts" %>
-<!-- Avo version: <%= Avo::VERSION %> -->
-</body>
+    <%= render partial: "avo/partials/scripts" %>
+    <!-- Avo version: <%= Avo::VERSION %> -->
+  </body>
 </html>

data/lib/avo/base_action.rb

@@ -61,8 +61,7 @@ module Avo
       self.class.cancel_button_label ||= I18n.t("avo.cancel")
 
       @response ||= {}
-      @response[:message_type] ||= :notice
-      @response[:message] ||= I18n.t("avo.action_ran_successfully")
+      @response[:messages] = []
     end
 
     def context
@@ -131,15 +130,25 @@ module Avo
     end
 
     def succeed(text)
-      response[:message_type] = :notice
-      response[:message] = text
+      add_message text, :success
 
       self
     end
 
     def fail(text)
-      response[:message_type] = :alert
-      response[:message] = text
+      add_message text, :error
+
+      self
+    end
+
+    def inform(text)
+      add_message text, :info
+
+      self
+    end
+
+    def warn(text)
+      add_message text, :warning
 
       self
     end
@@ -168,5 +177,14 @@ module Avo
 
       self
     end
+
+    private
+
+    def add_message(body, type = :info)
+      response[:messages] << {
+        type: type,
+        body: body
+      }
+    end
   end
 end

data/lib/avo/engine.rb

@@ -31,7 +31,7 @@ module Avo
         path = Rails.root.join(*path_params)
 
         if File.directory? path.to_s
-          Rails.autoloaders.main.push_dir path
+          Rails.autoloaders.main.push_dir path.to_s
         end
       end
     end

data/lib/avo/fields/has_and_belongs_to_many_field.rb

@@ -4,10 +4,10 @@ module Avo
       def initialize(id, **args, &block)
         args[:updatable] = false
 
-        super(id, **args, &block)
-
         hide_on :all
         show_on :show
+
+        super(id, **args, &block)
       end
 
       def view_component_name

data/lib/avo/fields/has_many_field.rb

@@ -4,10 +4,10 @@ module Avo
       def initialize(id, **args, &block)
         args[:updatable] = false
 
-        super(id, **args, &block)
-
         hide_on :all
         show_on :show
+
+        super(id, **args, &block)
       end
     end
   end

data/lib/avo/fields/has_one_field.rb

@@ -4,10 +4,10 @@ module Avo
       attr_accessor :relation_method
 
       def initialize(id, **args, &block)
-        super(id, **args, &block)
-
         hide_on :new, :edit
 
+        super(id, **args, &block)
+
         @placeholder ||= I18n.t "avo.choose_an_option"
 
         @relation_method = name.to_s.parameterize.underscore

data/lib/avo/version.rb

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