avo 1.18.2.pre.0 → 1.19.1.pre.2

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

@@ -1,4 +1,6 @@
-<div <% if main_app.respond_to?(:destroy_user_session_path) %> data-controller="toggle-panel" <% end %>>
+<% destroy_user_session_path = "destroy_#{Avo.configuration.current_user_resource_name}_session_path".to_sym %>
+
+<div <% if main_app.respond_to?(destroy_user_session_path) %> data-controller="toggle-panel" <% end %>>
   <a href="javascript:void(0);" class="flex items-center cursor-pointer font-semibold text-gray-700" data-action="click->toggle-panel#togglePanel">
     <% if _current_user.respond_to?(:avatar) &&  _current_user.avatar.present? %>
       <%= image_tag _current_user.avatar, class: "h-12 rounded-full border-4 border-white mr-1" %>
@@ -10,14 +12,14 @@
     <% else %>
       Avo user
     <% end %>
-    <% if main_app.respond_to?(:destroy_user_session_path) %>
+    <% if main_app.respond_to?(destroy_user_session_path) %>
       <%= svg 'chevron-down', class: "ml-1 h-4" %>
     <% end %>
   </a>
 
-  <% if main_app.respond_to?(:destroy_user_session_path) %>
-    <div class="hidden absolute inset-auto inset-auto right-0 mr-6 mt-0 py-4 bg-white rounded-xl min-w-[200px] shadow-context" data-toggle-panel-target="panel">
-      <%= button_to t('avo.sign_out'), main_app.destroy_user_session_path, method: :delete, form: { "data-turbo" => "false" }, class: "appearance-none bg-white text-left cursor-pointer text-green-600 font-semibold hover:text-white hover:bg-green-500 block px-4 py-1 w-full" %>
+  <% if main_app.respond_to?(destroy_user_session_path) %>
+    <div class="hidden absolute inset-auto right-0 mr-6 mt-0 py-4 bg-white rounded-xl min-w-[200px] shadow-context" data-toggle-panel-target="panel">
+      <%= button_to t('avo.sign_out'), main_app.send(:destroy_user_session_path), method: :delete, form: { "data-turbo" => "false" }, class: "appearance-none bg-white text-left cursor-pointer text-green-600 font-semibold hover:text-white hover:bg-green-500 block px-4 py-1 w-full" %>
     </div>
   <% end %>
 </div>

data/app/views/avo/relations/new.html.erb

@@ -22,8 +22,6 @@
         </div>
       </div>
 
-      <%#= form.hidden_field :resource_ids, value: params[:resource_ids], 'data-action-target': 'resourceIds' %>
-
       <% c.controls do %>
         <%= a_button t('avo.cancel'), 'data-action': 'click->modal#close', size: :sm %>
         <%= a_button t('avo.attach'), type: :submit, color: :green, size: :sm %>

data/app/views/avo/sidebar/_sidebar.html.erb

@@ -12,7 +12,7 @@
 
         <div class="w-full">
           <% Avo::App.resources_navigation(_current_user).sort_by { |r| r.navigation_label }.each do |resource| %>
-            <%= render Avo::NavigationLinkComponent.new label: resource.navigation_label, path: resources_path(resource.model_class) %>
+            <%= render Avo::NavigationLinkComponent.new label: resource.navigation_label, path: resources_path(resource: resource) %>
           <% end %>
 
           <% sidebar_partials = Avo::App.get_sidebar_partials %>

data/app/views/kaminari/_page.html.erb

@@ -1,4 +1,4 @@
-<% url = resources_path(@resource.model_class, page: page, keep_query_params: true) %>
+<% url = resources_path(resource: @resource, page: page, keep_query_params: true) %>
 <% if page.current? %>
   <button type="button" class="hidden md:inline-flex -ml-px relative items-center px-4 py-2 border bg-gray-100 text-sm leading-5 font-medium text-gray-700 hover:text-gray-500 z-10 outline-none border-primary-300 active:bg-gray-100 transition ease-in-out duration-150">
     <%= page %>

data/config/routes.rb

@@ -10,6 +10,8 @@ Avo::Engine.routes.draw do
     post "/resources/:resource_name/:id/attachments/", to: "attachments#create"
   end
 
+  get "failed_to_load", to: "home#failed_to_load"
+
   scope "resources", as: "resources" do
     # Attachments
     get "/:resource_name/:id/active_storage_attachments/:attachment_name/:signed_attachment_id", to: "attachments#show"
@@ -24,10 +26,10 @@ Avo::Engine.routes.draw do
     instance_eval(&Avo::App.draw_routes)
 
     # Relations
-    get "/:resource_name/:id/:related_name/new", to: "relations#new"
-    get "/:resource_name/:id/:related_name/", to: "relations#index"
-    get "/:resource_name/:id/:related_name/:related_id", to: "relations#show"
-    post "/:resource_name/:id/:related_name", to: "relations#create"
-    delete "/:resource_name/:id/:related_name/:related_id", to: "relations#destroy"
+    get "/:resource_name/:id/:related_name/new", to: "relations#new", as: "associations_new"
+    get "/:resource_name/:id/:related_name/", to: "relations#index", as: "associations_index"
+    get "/:resource_name/:id/:related_name/:related_id", to: "relations#show", as: "associations_show"
+    post "/:resource_name/:id/:related_name", to: "relations#create", as: "associations_create"
+    delete "/:resource_name/:id/:related_name/:related_id", to: "relations#destroy", as: "associations_destroy"
   end
 end

data/lib/avo/app.rb

@@ -8,6 +8,7 @@ module Avo
     class_attribute :license, default: nil
     class_attribute :current_user, default: nil
     class_attribute :root_path, default: nil
+    class_attribute :view_context, default: nil
 
     class << self
       def boot
@@ -22,17 +23,22 @@ module Avo
         end
       end
 
-      def init(request:, context:, current_user:, root_path:)
+      def init(request:, context:, current_user:, root_path:, view_context:)
         self.request = request
         self.context = context
         self.current_user = current_user
         self.root_path = root_path
+        self.view_context = view_context
 
         self.license = Licensing::LicenseManager.new(Licensing::HQ.new(request).response).license
 
         # Set the current host for ActiveStorage
         begin
-          ActiveStorage::Current.url_options = request.base_url
+          if Rails::VERSION::MAJOR === 6
+            ActiveStorage::Current.host = request.base_url
+          elsif Rails::VERSION::MAJOR === 7
+            ActiveStorage::Current.url_options = request.base_url
+          end
         rescue => exception
           Rails.logger.debug "[Avo] Failed to set ActiveStorage::Current.url_options, #{exception.inspect}"
         end
@@ -121,8 +127,8 @@ module Avo
 
       def get_available_resources(user = nil)
         resources.select do |resource|
-            Services::AuthorizationService.authorize user, resource.model_class, Avo.configuration.authorization_methods.stringify_keys["index"], raise_exception: false
-          end
+          Services::AuthorizationService.authorize user, resource.model_class, Avo.configuration.authorization_methods.stringify_keys["index"], raise_exception: false
+        end
           .sort_by { |r| r.name }
       end
 
@@ -145,7 +151,7 @@ module Avo
             # remove the leading underscore (_)
             filename[0] = ""
             # remove the extension
-            filename.gsub!('.html.erb', '')
+            filename.gsub!(".html.erb", "")
             filename
           end
       end
@@ -163,13 +169,7 @@ module Avo
               resource.is_a? Class
             end
             .map do |resource|
-              route_key = if resource.model_class.present?
-                resource.model_class.model_name.plural.to_sym
-              else
-                resource.to_s.underscore.gsub("_resource", "").downcase.pluralize.to_sym
-              end
-
-              resources route_key
+              resources resource.new.model_key
             end
         end
       end

data/lib/avo/base_action.rb

@@ -14,6 +14,7 @@ module Avo
     class_attribute :resource
     class_attribute :fields
     class_attribute :standalone, default: false
+    class_attribute :visible
 
     attr_accessor :response
     attr_accessor :model
@@ -27,10 +28,11 @@ module Avo
       self.class.to_s.demodulize.underscore.humanize(keep_id_suffix: true)
     end
 
-    def initialize(model: nil, resource: nil, user: nil)
+    def initialize(model: nil, resource: nil, user: nil, view: nil)
       self.class.model = model if model.present?
       self.class.resource = resource if resource.present?
       self.class.user = user if user.present?
+      self.class.view = view if view.present?
 
       self.class.message ||= I18n.t("avo.are_you_sure_you_want_to_run_this_option")
       self.class.confirm_button_label ||= I18n.t("avo.run")
@@ -96,6 +98,12 @@ module Avo
       self
     end
 
+    def visible_in_view
+      return true unless visible.present?
+
+      instance_exec(resource: self.class.resource, view: view, &visible)
+    end
+
     def param_id
       self.class.to_s.demodulize.underscore.tr "/", "_"
     end

data/lib/avo/base_resource.rb

@@ -4,6 +4,14 @@ module Avo
     extend FieldsCollector
     extend HasContext
 
+    include ActionView::Helpers::UrlHelper
+
+    delegate :view_context, to: 'Avo::App'
+    delegate :main_app, to: :view_context
+    delegate :avo, to: :view_context
+    delegate :resource_path, to: :view_context
+    delegate :resources_path, to: :view_context
+
     attr_accessor :view
     attr_accessor :model
     attr_accessor :user
@@ -74,7 +82,9 @@ module Avo
     end
 
     def initialize
-      self.class.model_class = model_class.base_class
+      unless self.class.model_class.present?
+        self.class.model_class = model_class.base_class
+      end
     end
 
     def hydrate(model: nil, view: nil, user: nil, params: nil)
@@ -256,10 +266,6 @@ module Avo
       view_types
     end
 
-    def route_key
-      model_class.model_name.route_key
-    end
-
     def context
       self.class.context
     end
@@ -358,8 +364,28 @@ module Avo
       end
     end
 
-    def avo_path
-      "#{Avo::App.root_path}/resources/#{model_class.model_name.route_key}/#{model.id}"
+    def route_key
+      model_class.model_name.route_key
+    end
+
+    # This is used as the model class ID
+    # We use this instead of the route_key to maintain compatibility with uncountable models
+    # With uncountable models route key appends an _index suffix (Fish->fish_index)
+    # Example: User->users, MediaItem->medie_items, Fish->fish
+    def model_key
+      model_class.model_name.plural
+    end
+
+    def singular_model_key
+      model_class.model_name.singular
+    end
+
+    def record_path
+      resource_path(model: model, resource: self)
+    end
+
+    def records_path
+      resources_path(resource: self)
     end
 
     def label_field

data/lib/avo/configuration.rb

@@ -25,6 +25,8 @@ module Avo
     attr_accessor :search_debounce
     attr_accessor :view_component_path
     attr_accessor :display_license_request_timeout_error
+    attr_accessor :current_user_resource_name
+    attr_accessor :raise_error_on_missing_policy
 
     def initialize
       @root_path = "/avo"
@@ -62,6 +64,8 @@ module Avo
       @search_debounce = 300
       @view_component_path = "app/components"
       @display_license_request_timeout_error = true
+      @current_user_resource_name = "user"
+      @raise_error_on_missing_policy = false
     end
 
     def locale_tag

data/lib/avo/fields/base_field.rb

@@ -3,8 +3,14 @@ module Avo
     class BaseField
       extend ActiveSupport::DescendantsTracker
       extend Avo::Fields::FieldExtensions::HasFieldName
+
+      include ActionView::Helpers::UrlHelper
       include Avo::Fields::FieldExtensions::VisibleInDifferentViews
 
+      delegate :view_context, to: 'Avo::App'
+      delegate :main_app, to: :view_context
+      delegate :avo, to: :view_context
+
       attr_reader :id
       attr_reader :block
       attr_reader :required
@@ -13,7 +19,6 @@ module Avo
       attr_reader :nullable
       attr_reader :null_values
       attr_reader :format_using
-      attr_reader :placeholder
       attr_reader :help
       attr_reader :default
       attr_reader :visible
@@ -51,7 +56,7 @@ module Avo
         @nullable = args[:nullable] || false
         @null_values = args[:null_values] || [nil, ""]
         @format_using = args[:format_using] || nil
-        @placeholder = args[:placeholder] || id.to_s.humanize(keep_id_suffix: true)
+        @placeholder = args[:placeholder]
         @help = args[:help] || nil
         @default = args[:default] || nil
         @visible = args[:visible] || true
@@ -97,6 +102,12 @@ module Avo
         @id.to_s.humanize(keep_id_suffix: true)
       end
 
+      def placeholder
+        return @placeholder if @placeholder.present?
+
+        name
+      end
+
       def visible?
         if visible.present? && visible.respond_to?(:call)
           visible.call resource: @resource
@@ -121,11 +132,11 @@ module Avo
 
         # Run callback block if present
         if computable && block.present?
-          final_value = block.call @model, @resource, @view, self
+          final_value = instance_exec(@model, @resource, @view, self, &block)
         end
 
         # Run the value through resolver if present
-        final_value = @format_using.call final_value if @format_using.present?
+        final_value = instance_exec(final_value, &@format_using) if @format_using.present?
 
         final_value
       end

data/lib/avo/fields/has_and_belongs_to_many_field.rb

@@ -1,6 +1,6 @@
 module Avo
   module Fields
-    class HasAndBelongsToManyField < BaseField
+    class HasAndBelongsToManyField < HasBaseField
       def initialize(id, **args, &block)
         args[:updatable] = false
 
@@ -13,24 +13,6 @@ module Avo
       def view_component_name
         "HasManyField"
       end
-
-      def turbo_frame
-        "#{self.class.name.demodulize.to_s.underscore}_#{id}"
-      end
-
-      def frame_url
-        "#{Avo::App.root_path}/resources/#{@model.model_name.route_key}/#{@model.id}/#{id}?turbo_frame=#{turbo_frame}"
-      end
-
-      def target_resource
-        if @model._reflections[id.to_s].klass.present?
-          Avo::App.get_resource_by_model_name @model._reflections[id.to_s].klass.to_s
-        elsif @model._reflections[id.to_s].options[:class_name].present?
-          Avo::App.get_resource_by_model_name @model._reflections[id.to_s].options[:class_name]
-        else
-          Avo::App.get_resource_by_name id.to_s
-        end
-      end
     end
   end
 end

data/lib/avo/fields/has_base_field.rb

@@ -0,0 +1,35 @@
+module Avo
+  module Fields
+    class HasBaseField < BaseField
+      attr_accessor :display
+
+      def initialize(id, **args, &block)
+        super(id, **args, &block)
+
+        @display = args[:display].present? ? args[:display] : :show
+      end
+
+      def resource
+        Avo::App.get_resource_by_model_name @model.class
+      end
+
+      def turbo_frame
+        "#{self.class.name.demodulize.to_s.underscore}_#{display}_#{id}"
+      end
+
+      def frame_url
+        "#{@resource.record_path}/#{id}?turbo_frame=#{turbo_frame}"
+      end
+
+      def target_resource
+        if @model._reflections[id.to_s].klass.present?
+          Avo::App.get_resource_by_model_name @model._reflections[id.to_s].klass.to_s
+        elsif @model._reflections[id.to_s].options[:class_name].present?
+          Avo::App.get_resource_by_model_name @model._reflections[id.to_s].options[:class_name]
+        else
+          Avo::App.get_resource_by_name id.to_s
+        end
+      end
+    end
+  end
+end

data/lib/avo/fields/has_many_field.rb

@@ -1,6 +1,6 @@
 module Avo
   module Fields
-    class HasManyField < BaseField
+    class HasManyField < HasBaseField
       def initialize(id, **args, &block)
         args[:updatable] = false
 
@@ -9,24 +9,6 @@ module Avo
         hide_on :all
         show_on :show
       end
-
-      def turbo_frame
-        "#{self.class.name.demodulize.to_s.underscore}_#{id}"
-      end
-
-      def frame_url
-        "#{Avo::App.root_path}/resources/#{@model.model_name.route_key}/#{@model.id}/#{id}?turbo_frame=#{turbo_frame}"
-      end
-
-      def target_resource
-        if @model._reflections[id.to_s].klass.present?
-          Avo::App.get_resource_by_model_name @model._reflections[id.to_s].klass.to_s
-        elsif @model._reflections[id.to_s].options[:class_name].present?
-          Avo::App.get_resource_by_model_name @model._reflections[id.to_s].options[:class_name]
-        else
-          Avo::App.get_resource_by_name id.to_s
-        end
-      end
     end
   end
 end

data/lib/avo/fields/has_one_field.rb

@@ -1,8 +1,7 @@
 module Avo
   module Fields
-    class HasOneField < BaseField
+    class HasOneField < HasBaseField
       attr_accessor :relation_method
-      attr_accessor :display
 
       def initialize(id, **args, &block)
         super(id, **args, &block)
@@ -12,7 +11,6 @@ module Avo
         @placeholder ||= I18n.t "avo.choose_an_option"
 
         @relation_method = name.to_s.parameterize.underscore
-        @display = args[:display].present? ? args[:display] : :show
       end
 
       def label
@@ -20,25 +18,11 @@ module Avo
       end
 
       def resource
-        target_resource
-      end
-
-      def turbo_frame
-        "#{self.class.name.demodulize.to_s.underscore}_#{display}_#{id}"
+        Avo::App.get_resource_by_model_name @model.class
       end
 
       def frame_url
-        "#{Avo::App.root_path}/resources/#{@model.model_name.route_key}/#{@model.id}/#{id}/#{value.id}?turbo_frame=#{turbo_frame}"
-      end
-
-      def target_resource
-        if @model._reflections[id.to_s].klass.present?
-          Avo::App.get_resource_by_model_name @model._reflections[id.to_s].klass.to_s
-        elsif @model._reflections[id.to_s].options[:class_name].present?
-          Avo::App.get_resource_by_model_name @model._reflections[id.to_s].options[:class_name]
-        else
-          Avo::App.get_resource_by_name id.to_s
-        end
+        "#{@resource.record_path}/#{id}/#{value.id}?turbo_frame=#{turbo_frame}"
       end
 
       def fill_field(model, key, value, params)

data/lib/avo/fields/key_value_field.rb

@@ -15,10 +15,10 @@ module Avo
 
         hide_on :index
 
-        @key_label = args[:key_label].present? ? args[:key_label].to_s : "Key"
-        @value_label = args[:value_label].present? ? args[:value_label].to_s : "Value"
-        @action_text = args[:action_text].present? ? args[:action_text].to_s : "Add row"
-        @delete_text = args[:delete_text].present? ? args[:delete_text].to_s : "Delete row"
+        @key_label = args[:key_label].present? ? args[:key_label].to_s : I18n.translate('avo.key_value_field.key')
+        @value_label = args[:value_label].present? ? args[:value_label].to_s : I18n.translate('avo.key_value_field.value')
+        @action_text = args[:action_text].present? ? args[:action_text].to_s : I18n.translate('avo.key_value_field.add_row')
+        @delete_text = args[:delete_text].present? ? args[:delete_text].to_s : I18n.translate('avo.key_value_field.delete_row')
 
         @disable_editing_keys = args[:disable_editing_keys].present? ? args[:disable_editing_keys] : false
         # disabling editing keys also disables adding rows (doesn't take into account the value of disable_adding_rows)

data/lib/avo/fields/text_field.rb

@@ -2,11 +2,13 @@ module Avo
   module Fields
     class TextField < BaseField
       attr_reader :link_to_resource
+      attr_reader :as_html
 
       def initialize(id, **args, &block)
         super(id, **args, &block)
 
         @link_to_resource = args[:link_to_resource].present? ? args[:link_to_resource] : false
+        @as_html = args[:as_html].present? ? args[:as_html] : false
       end
     end
   end

data/lib/avo/services/authorization_service.rb

@@ -48,8 +48,10 @@ module Avo
             end
 
             true
-          rescue Pundit::NotDefinedError
-            false
+          rescue Pundit::NotDefinedError => e
+            return false unless Avo.configuration.raise_error_on_missing_policy
+
+            raise e
           rescue => error
             if args[:raise_exception] == false
               false
@@ -73,8 +75,10 @@ module Avo
 
           begin
             Pundit.policy_scope! user, model
-          rescue
-            model
+          rescue Pundit::NotDefinedError => e
+            return model unless Avo.configuration.raise_error_on_missing_policy
+
+            raise e
           end
         end
 

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "1.18.2.pre.0"
+  VERSION = "1.19.1.pre.2"
 end

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

@@ -8,7 +8,7 @@ en:
     run: 'Run'
     cancel: 'Cancel'
     action_ran_successfully: 'Action ran successfully!'
-    resource_details: "%{item} details: %{title}"
+    resource_details: '%{item} details: %{title}'
     update_item: 'update %{item}: %{title}'
     unauthorized: 'Unauthorized'
     attachment_class_attached: '%{attachment_class} attached.'
@@ -16,8 +16,8 @@ en:
     resource_updated: 'Resource updated'
     resource_created: 'Resource created'
     resource_destroyed: 'Resource destroyed'
-    switch_to_view: "Switch to %{view_type} view"
-    click_to_reveal_filters: "Click to reveal filters"
+    switch_to_view: 'Switch to %{view_type} view'
+    click_to_reveal_filters: 'Click to reveal filters'
     attachment_destroyed: 'Attachment destroyed'
     failed_to_find_attachment: 'Failed to find attachment'
     you_missed_something_check_form: 'You might have missed something. Please check the form.'
@@ -84,3 +84,12 @@ en:
       placeholder: 'Search'
       cancel_button: 'Cancel'
     sign_out: 'Sign out'
+    failed: 'Failed'
+    failed_to_load: 'Failed to load'
+    key_value_field:
+      key: 'Key'
+      value: 'Value'
+      add_row: 'Add row'
+      delete_row: 'Delete row'
+    was_successfully_created: 'was successfully created'
+    was_successfully_updated: 'was successfully updated'

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

@@ -71,3 +71,10 @@ ro:
       placeholder: 'Cauta'
       cancel_button: 'Anulare'
     sign_out: 'Delogare'
+    key_value_field:
+      key: 'Cheie'
+      value: 'Valoare'
+      add_row: 'Adauga rand'
+      delete_row: 'Sterge rand'
+    was_successfully_created: 'a fost creat'
+    was_successfully_updated: 'a fost actualizat'