avo 2.8.0 → 2.9.1.pre2

data/app/components/avo/views/resource_edit_component.rb

@@ -4,9 +4,13 @@ class Avo::Views::ResourceEditComponent < Avo::ResourceComponent
   include Avo::ResourcesHelper
   include Avo::ApplicationHelper
 
-  def initialize(resource: nil)
+  attr_reader :view
+
+  def initialize(resource: nil, model: nil, actions: [], view: :edit)
     @resource = resource
-    @view = :edit
+    @model = model
+    @actions = actions
+    @view = view
 
     split_panel_fields
   end
@@ -17,14 +21,18 @@ class Avo::Views::ResourceEditComponent < Avo::ResourceComponent
     elsif via_index?
       helpers.resources_path(resource: @resource)
     else # via resource show page
-      helpers.resource_path(model: @resource.model, resource: @resource)
+      if is_edit?
+        helpers.resource_path(model: @resource.model, resource: @resource)
+      else
+        helpers.resources_path(resource: @resource)
+      end
     end
   end
 
   # The save button is dependent on the edit? policy method.
   # The update? method should be called only when the user clicks the Save button so the developer gets access to the params from the form.
   def can_see_the_save_button?
-    @resource.authorization.authorize_action :edit, raise_exception: false
+    @resource.authorization.authorize_action @view, raise_exception: false
   end
 
   private
@@ -32,4 +40,24 @@ class Avo::Views::ResourceEditComponent < Avo::ResourceComponent
   def via_index?
     params[:via_view] == "index"
   end
+
+  def is_edit?
+    view == :edit
+  end
+
+  def form_url
+    if is_edit?
+      helpers.resource_path(
+        model: @resource.model,
+        resource: @resource
+      )
+    else
+      helpers.resources_path(
+        resource: @resource,
+        via_relation_class: params[:via_relation_class],
+        via_relation: params[:via_relation],
+        via_resource_id: params[:via_resource_id]
+      )
+    end
+  end
 end

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

@@ -15,7 +15,7 @@
         <% end %>
       <% end %>
       <% if can_see_the_actions_button? %>
-        <%= render Avo::ActionsComponent.new actions: @actions, resource: @resource %>
+        <%= render Avo::ActionsComponent.new actions: @actions, resource: @resource, view: @view %>
       <% end %>
       <% if can_see_the_create_button? %>
         <%= a_link create_path,

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

@@ -22,7 +22,7 @@
                 } do %>
                 <%= t('avo.detach_item', item: title).capitalize %>
               <% end %>
-              <%= render Avo::ActionsComponent.new actions: @actions, resource: @resource %>
+              <%= render Avo::ActionsComponent.new actions: @actions, resource: @resource, view: @view %>
             <% end %>
             <% if can_see_the_edit_button? %>
               <%= a_link edit_path,
@@ -57,7 +57,7 @@
                 <%= t('avo.delete').capitalize %>
               <% end %>
             <% end %>
-            <%= render Avo::ActionsComponent.new actions: @actions, resource: @resource %>
+            <%= render Avo::ActionsComponent.new actions: @actions, resource: @resource, view: @view %>
             <% if @resource.authorization.authorize_action(:edit, raise_exception: false) %>
               <%= a_link edit_path,
                 color: :primary,

data/app/controllers/avo/base_controller.rb

@@ -76,7 +76,7 @@ module Avo
 
     def show
       @resource.hydrate(model: @model, view: :show, user: _current_user, params: params)
-      
+
       set_actions
 
       @page_title = @resource.default_panel_name.to_s
@@ -101,6 +101,8 @@ module Avo
       @model = @resource.model_class.new
       @resource = @resource.hydrate(model: @model, view: :new, user: _current_user)
 
+      set_actions
+
       @page_title = @resource.default_panel_name.to_s
 
       if params[:via_relation_class].present? && params[:via_resource_id].present?
@@ -161,6 +163,7 @@ module Avo
     end
 
     def edit
+      set_actions
     end
 
     def update
@@ -391,20 +394,22 @@ module Avo
         return resource_path(model: params[:via_relation_class].safe_constantize, resource: parent_resource, resource_id: params[:via_resource_id])
       end
 
-      redirect_path_from_resource_option || resource_path(model: @model, resource: @resource)
+      redirect_path_from_resource_option(:after_create_path) || resource_path(model: @model, resource: @resource)
     end
 
     def after_update_path
       return params[:referrer] if params[:referrer].present?
 
-      redirect_path_from_resource_option || resource_path(model: @model, resource: @resource)
+      redirect_path_from_resource_option(:after_update_path) || resource_path(model: @model, resource: @resource)
     end
 
-    def redirect_path_from_resource_option
-      return nil if @resource.class.after_update_path.blank?
+    def redirect_path_from_resource_option(action = :after_update_path)
+      return nil if @resource.class.send(action).blank?
 
-      if @resource.class.after_create_path == :index
+      if @resource.class.send(action) == :index
         resources_path(resource: @resource)
+      elsif @resource.class.send(action) == :edit
+        edit_resource_path(resource: @resource, model: @resource.model)
       else
         resource_path(model: @model, resource: @resource)
       end

data/app/helpers/avo/url_helpers.rb

@@ -12,10 +12,9 @@ module Avo
         end
       end
 
-      # Create the `route_key` from the model key so the namespaced models get the proper path (SomeModule::Post -> some_module_post).
-      # Add the `_index` suffix for the uncountable models so they get the correct path (`fish_index`)
-      route_key = resource.model_key
-      route_key << "_index" if resource.model_name.singular == resource.model_name.plural
+      route_key = resource.route_key
+      # Add the `_index` suffix for the uncountable names so they get the correct path (`fish_index`)
+      route_key << "_index" if resource.route_key == resource.singular_route_key
 
       avo.send :"resources_#{route_key}_path", **existing_params, **args
     end
@@ -33,19 +32,19 @@ module Avo
         id = resource_id
       end
 
-      avo.send :"resources_#{resource.singular_model_key}_path", id, **args
+      avo.send :"resources_#{resource.singular_route_key}_path", id, **args
     end
 
     def new_resource_path(model:, resource:, **args)
-      avo.send :"new_resources_#{resource.singular_model_key}_path", **args
+      avo.send :"new_resources_#{resource.singular_route_key}_path", **args
     end
 
     def edit_resource_path(model:, resource:, **args)
-      avo.send :"edit_resources_#{resource.singular_model_key}_path", model, **args
+      avo.send :"edit_resources_#{resource.singular_route_key}_path", model, **args
     end
 
     def resource_attach_path(resource, model_id, related_name, related_id = nil)
-      helpers.avo.resources_associations_new_path(resource.singular_model_key, model_id, related_name)
+      helpers.avo.resources_associations_new_path(resource.singular_route_key, model_id, related_name)
     end
 
     def resource_detach_path(
@@ -79,7 +78,7 @@ module Avo
     end
 
     def order_up_resource_path(model:, resource:, **args)
-      avo.send :"order_up_resources_#{resource.singular_model_key}_path", model, **args
+      avo.send :"order_up_resources_#{resource.singular_route_key}_path", model, **args
     end
   end
 end

data/app/javascript/js/controllers.js

@@ -7,7 +7,6 @@ import BelongsToFieldController from './controllers/fields/belongs_to_field_cont
 import BooleanFilterController from './controllers/boolean_filter_controller'
 import CodeFieldController from './controllers/fields/code_field_controller'
 import CopyToClipboardController from './controllers/copy_to_clipboard_controller'
-import CourseResourceController from './controllers/custom/course_resource_controller'
 import DashboardCardController from './controllers/dashboard_card_controller'
 import DateFieldController from './controllers/fields/date_field_controller'
 import FilterController from './controllers/filter_controller'
@@ -70,4 +69,3 @@ application.register('simple-mde', SimpleMdeController)
 application.register('trix-field', TrixFieldController)
 
 // Custom controllers
-application.register('course-resource', CourseResourceController)

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

@@ -1 +1,2 @@
-<%= render Avo::Views::ResourceEditComponent.new(resource: @resource) %>
+<%= render Avo::Views::ResourceEditComponent.new(resource: @resource, view: @view, actions: @actions) %>
+

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

@@ -1 +1 @@
-<%= render Avo::Views::ResourceNewComponent.new(resource: @resource, model: @model) %>
+<%= render Avo::Views::ResourceEditComponent.new(resource: @resource, model: @model, view: @view, actions: @actions) %>

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

@@ -5,13 +5,27 @@
     </a>
   </div>
 <% end %>
-
 <% if Avo::App.error_messages.present? %>
-  <% Avo::App.error_messages.each do |message| %>
-    <div class="w-full inset-auto bottom-0 z-50 mb-4 opacity-75 hover:opacity-100 transition-opacity duration-150">
-      <a href="https://avohq.io/pricing" target="_blank" class="rounded bg-orange-700 text-white py-2 px-4 text-sm block items-center flex leading-tight">
-        <%= svg "exclamation", class: "h-6 inline mr-2 text-bold flex-shrink-0 mr-1" %> <%= message %>
-      </a>
-    </div>
+  <% Avo::App.error_messages.each do |error| %>
+    <% if error.is_a? Hash %>
+      <%
+        url, message, target = error.values_at :url, :message, :target
+      %>
+      <div class="w-full inset-auto bottom-0 z-50 mb-4 opacity-75 hover:opacity-100 transition-opacity duration-150">
+        <a href="<%= url %>" target="<%= target %>" class="rounded bg-orange-700 text-white py-2 px-4 text-sm items-center flex leading-tight space-x-2">
+          <%= svg "exclamation", class: "h-6 inline mr-2 text-bold flex-shrink-0 mr-1" %>
+          <div>
+            <%= simple_format message %>
+          </div>
+        </a>
+      </div>
+    <% elsif error.is_a? String %>
+      <div class="w-full inset-auto bottom-0 z-50 mb-4 opacity-75 hover:opacity-100 transition-opacity duration-150">
+        <div class="rounded bg-orange-700 text-white py-2 px-4 text-sm items-center flex leading-tight space-x-2">
+          <%= svg "exclamation", class: "h-6 inline mr-2 text-bold flex-shrink-0 mr-1" %>
+          <div><%= simple_format error %></div>
+        </div>
+      </div>
+    <% end %>
   <% end %>
 <% end %>

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

@@ -30,6 +30,14 @@
         sort_direction = 'desc'
       end
       classes = "text-gray-500 tracking-tight leading-tight text-xs font-semibold"
+      classes += case field.index_text_align.to_sym
+        when :right
+          " text-right"
+        when :center
+          " text-center"
+        else
+          ""
+        end
     %>
     <th class="text-left uppercase px-3 py-2 whitespace-nowrap rounded-l">
       <% if field.sortable %>
@@ -38,7 +46,7 @@
           <%= render partial: 'avo/partials/sortable_component', locals: {field: field} %>
         <% end %>
       <% else %>
-        <div class="flex items-center <%= classes %>">
+        <div class="block w-full <%= classes %>">
           <%= field.name %>
         </div>
       <% end %>

data/bin/test

@@ -12,6 +12,7 @@ fi;
 # Run system tests
 if [[ -z "$1" ]] || [[ "$1" == "system" ]]; then
   yarn build:js
+  yarn build:custom-js
   yarn build:css
   bundle exec rspec ./spec --tag type:system
 fi;

data/lib/avo/app.rb

@@ -14,7 +14,7 @@ module Avo
     class_attribute :view_context, default: nil
     class_attribute :params, default: {}
     class_attribute :translation_enabled, default: false
-    class_attribute :error_messages, default: []
+    class_attribute :error_messages
 
     class << self
       def boot
@@ -52,6 +52,7 @@ module Avo
           Rails.logger.debug "[Avo] Failed to set ActiveStorage::Current.url_options, #{exception.inspect}"
         end
 
+        check_bad_resources
         init_resources
         init_dashboards if license.has_with_trial(:dashboards)
       end
@@ -80,6 +81,22 @@ module Avo
         )
       end
 
+      def check_bad_resources
+        resources.each do |resource|
+          has_model = resource.model_class.present?
+
+          unless has_model
+            possible_model = resource.class.to_s.gsub 'Resource', ''
+
+            Avo::App.error_messages.push({
+              url: "https://docs.avohq.io/2.0/resources.html#custom-model-class",
+              target: "_blank",
+              message: "#{resource.class.to_s} does not have a valid model assigned. It failed to find the #{possible_model} model. \n\r Please create that model or assign one using self.model_class = YOUR_MODEL"
+            })
+          end
+        end
+      end
+
       def init_resources
         self.resources = BaseResource.descendants
           .select do |resource|

data/lib/avo/base_action.rb

@@ -120,9 +120,14 @@ module Avo
     end
 
     def visible_in_view
-      return true unless visible.present?
+      # Run the visible block if available
+      return instance_exec(resource: self.class.resource, view: view, &visible) if visible.present?
 
-      instance_exec(resource: self.class.resource, view: view, &visible)
+      # Hide on the :new view by default
+      return false if view == :new
+
+      # Show on all other views
+      true
     end
 
     def param_id

data/lib/avo/base_resource.rb

@@ -5,8 +5,10 @@ module Avo
 
     include ActionView::Helpers::UrlHelper
     include Avo::Concerns::HasTools
+    include Avo::Concerns::HasModel
     include Avo::Concerns::HasFields
     include Avo::Concerns::HasStimulusControllers
+    include Avo::Concerns::ModelClassConstantized
 
     delegate :view_context, to: ::Avo::App
     delegate :simple_format, :content_tag, to: :view_context
@@ -28,7 +30,6 @@ module Avo
     class_attribute :search_query, default: nil
     class_attribute :search_query_help, default: ""
     class_attribute :includes, default: []
-    class_attribute :model_class
     class_attribute :translation_key
     class_attribute :default_view_type, default: :table
     class_attribute :devise_password_optional, default: false
@@ -435,7 +436,11 @@ module Avo
     end
 
     def route_key
-      model_class.model_name.route_key
+      class_name_without_resource.underscore.pluralize
+    end
+
+    def singular_route_key
+      route_key.singularize
     end
 
     # This is used as the model class ID

data/lib/avo/concerns/fetches_things.rb

@@ -22,6 +22,13 @@ module Avo
           end
         end
 
+        # Filters out the resources that are missing the model_class
+        def valid_resources
+          resources.select do |resource|
+            resource.model_class.present?
+          end
+        end
+
         # Returns the Avo resource by camelized name
         #
         # get_resource_by_name('User') => UserResource
@@ -45,9 +52,10 @@ module Avo
         # get_resource_by_name('User') => UserResource
         # get_resource_by_name(User) => UserResource
         def get_resource_by_model_name(name)
-          resources.find do |resource|
-            resource.model_class.model_name.name == name.to_s
-          end
+          valid_resources
+            .find do |resource|
+              resource.model_class.model_name.name == name.to_s
+            end
         end
 
         # Returns the Avo resource by singular snake_cased name
@@ -55,9 +63,10 @@ module Avo
         # get_resource_by_controller_name('delayed_backend_active_record_jobs') => DelayedJobResource
         # get_resource_by_controller_name('users') => UserResource
         def get_resource_by_controller_name(name)
-          resources.find do |resource|
-            resource.model_class.to_s.pluralize.underscore.tr("/", "_") == name.to_s
-          end
+          valid_resources
+            .find do |resource|
+              resource.model_class.to_s.pluralize.underscore.tr("/", "_") == name.to_s
+            end
         end
 
         # Returns the Avo resource by some name
@@ -73,9 +82,10 @@ module Avo
         end
 
         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
+          valid_resources
+            .select do |resource|
+              Services::AuthorizationService.authorize user, resource.model_class, Avo.configuration.authorization_methods.stringify_keys["index"], raise_exception: false
+            end
             .sort_by { |r| r.name }
         end
 
@@ -85,9 +95,6 @@ module Avo
 
         def resources_for_navigation(user = nil)
           get_available_resources(current_user)
-            .select do |resource|
-              resource.model_class.present?
-            end
             .select do |resource|
               resource.visible_on_sidebar
             end

data/lib/avo/concerns/has_model.rb

@@ -0,0 +1,11 @@
+module Avo
+  module Concerns
+    module HasModel
+      extend ActiveSupport::Concern
+
+      def has_model_id?
+        model.present? && model.id.present?
+      end
+    end
+  end
+end

data/lib/avo/concerns/model_class_constantized.rb

@@ -0,0 +1,23 @@
+module Avo
+  module Concerns
+    module ModelClassConstantized
+      extend ActiveSupport::Concern
+
+      class_methods do
+        attr_reader :model_class
+
+        # Cast the model class to a constantized version and memoize it like that
+        def model_class=(value)
+          @model_class = case value
+          when Class
+            value
+          when String, Symbol
+            value.to_s.safe_constantize
+          else
+            raise ArgumentError.new "Failed to find a proper model class for #{self.to_s}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avo/dynamic_router.rb

@@ -14,7 +14,7 @@ module Avo
         #   resource.model_class.present?
         # end
         .map do |resource|
-          router.resources resource.new.model_key
+          router.resources resource.new.route_key
         end
     end
   end

data/lib/avo/engine.rb

@@ -17,8 +17,6 @@ module Avo
       ::Avo::App.boot
     end
 
-    config.i18n.load_path += Dir[Avo::Engine.root.join("lib", "generators", "avo", "templates", "locales", "*.{rb,yml}")]
-
     initializer "avo.autoload" do |app|
       [
         ["app", "avo", "fields"],
@@ -73,7 +71,7 @@ module Avo
         begin
           Licensing::HQ.new.clear_response
         rescue => exception
-          puts "Failed to clear Avo HQ response: #{e.message}"
+          puts "Failed to clear Avo HQ response: #{exception.message}"
         end
       end
     end

data/lib/avo/fields/base_field.rb

@@ -9,6 +9,7 @@ module Avo
 
       include Avo::Concerns::HandlesFieldArgs
       include Avo::Concerns::HasHTMLAttributes
+      include Avo::Fields::Concerns::IsRequired
 
       delegate :view_context, to: ::Avo::App
       delegate :simple_format, :content_tag, to: :view_context

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

@@ -0,0 +1,17 @@
+module Avo
+  module Fields
+    module Concerns
+      module IsRequired
+        extend ActiveSupport::Concern
+
+        def is_required?
+          if required.respond_to? :call
+            Avo::Hosts::ViewRecordHost.new(block: required, record: model, view: view).handle
+          else
+            required
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avo/hosts/view_record_host.rb

@@ -0,0 +1,7 @@
+module Avo
+  module Hosts
+    class ViewRecordHost < RecordHost
+      option :view
+    end
+  end
+end

data/lib/avo/menu/base_item.rb

@@ -17,4 +17,8 @@ class Avo::Menu::BaseItem
       Avo::Hosts::BaseHost.new(block: visible).handle
     end
   end
+
+  def navigation_label
+    label || entity_label
+  end
 end

data/lib/avo/menu/dashboard.rb

@@ -2,6 +2,7 @@ class Avo::Menu::Dashboard < Avo::Menu::BaseItem
   extend Dry::Initializer
 
   option :dashboard
+  option :label, optional: true
 
   def parsed_dashboard
     dashboard_by_id || dashboard_by_name
@@ -14,4 +15,8 @@ class Avo::Menu::Dashboard < Avo::Menu::BaseItem
   def dashboard_by_id
     Avo::App.get_dashboard_by_id dashboard.to_s
   end
+
+  def entity_label
+    parsed_dashboard.navigation_label
+  end
 end

data/lib/avo/menu/resource.rb

@@ -2,8 +2,13 @@ class Avo::Menu::Resource < Avo::Menu::BaseItem
   extend Dry::Initializer
 
   option :resource
+  option :label, optional: true
 
   def parsed_resource
     Avo::App.guess_resource resource.to_s
   end
+
+  def entity_label
+    parsed_resource.navigation_label
+  end
 end

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "2.8.0" unless const_defined?(:VERSION)
+  VERSION = "2.9.1.pre2" unless const_defined?(:VERSION)
 end

data/lib/avo.rb

@@ -7,6 +7,7 @@ loader.inflector.inflect(
   "html" => "HTML",
   "has_html_attributes" => "HasHTMLAttributes"
 )
+loader.ignore("#{__dir__}/generators")
 loader.setup
 
 #                                      .//*,,.....,,*/(*

data/lib/generators/avo/install_generator.rb

@@ -13,10 +13,7 @@ module Generators
         route "mount Avo::Engine, at: Avo.configuration.root_path"
 
         template "initializer/avo.tt", "config/initializers/avo.rb"
-        template "locales/avo.en.yml", "config/locales/avo.en.yml"
-        template "locales/avo.nb-NO.yml", "config/locales/avo.nb-NO.yml"
-        template "locales/avo.pt-BR.yml", "config/locales/avo.pt-BR.yml"
-        template "locales/avo.ro.yml", "config/locales/avo.ro.yml"
+        directory File.join(__dir__, "templates", "locales"), "config/locales"
       end
     end
   end