avo 2.8.0 → 2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '083a689ccb76278fae699dd89eb21f5cf1dc86a306e2d25c1015a9297eb6f171'
-  data.tar.gz: ba27d9448b88241853e50a260764f70e232b566352b959c1b8265c5d547d3fea
+  metadata.gz: 7a1d99b5007b69c25b8eb7b426fd8881d9baacc700d4f14c0ed8dfeac81c7004
+  data.tar.gz: bb18e3d2d52f500c3d73ae8f29bf0165ea560905c848388bfeef127850cc5e79
 SHA512:
-  metadata.gz: 8cd68a6ab28242fcd7db9706e58e0ce49575acd055bdddf4be7231092301b46a218ac492b6634b041b8e181ddfc3871e968b280188025d1d05ba715e5c8d94bb
-  data.tar.gz: 5aff67676e320a05f76c5403124470f6c2ab027dc16853c74eeb991a26d22f8259014e26aae581e9ac6b39f7ed8837379359ae525560632039728148e7a14857
+  metadata.gz: 516b6413536158cd998e3addbb3b327f3fbdbdec504a9f1502aaadc5f52925490966c22a5d67f161933e08e5c5c0f4c0a0bf1e3a207216297dd65e50966569b9
+  data.tar.gz: 5474fa61b0268b691865abc602271828c49500612bbe22617a2bf117fc1c2cc05ab0568ba78ea917ff021bf63bfd63ad9d728868d723e9684dc9c7c38e636615

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.8.0)
+    avo (2.9.0)
       active_link_to
       addressable
       breadcrumbs_on_rails
@@ -136,7 +136,7 @@ GEM
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
-    chartkick (4.1.3)
+    chartkick (4.2.0)
     childprocess (4.1.0)
     concurrent-ruby (1.1.9)
     countries (4.2.1)

data/README.md

@@ -76,6 +76,17 @@ Please read the [UPGRADE_GUIDE.MD](https://docs.avohq.io/2.0/upgrade.html)
 </a>
 <!--  https://contrib.rocks -->
 
+# 🥇 Business & Agency Sponsors
+
+<a href="https://equipetechnique.com/?utm_source=github&utm_medium=link&utm_campaign=avo_code_without_borders" target="_blank">
+  <picture>
+    <source media="(prefers-color-scheme: dark)" srcset="https://avohq.io/img/sponsors/ET-dark.jpeg">
+    <img alt="Equipe Technique Busines Sponsor" src="https://avohq.io/img/sponsors/ET-light.jpeg" width="240px">
+  </picture>
+</a>
+
+[Become a sponsor ](https://github.com/sponsors/adrianthedev)
+
 
 ![Alt](https://repobeats.axiom.co/api/embed/1481a6a259064f02a7936470d12a50802a9c98a4.svg "Repobeats analytics image")
 

data/app/assets/stylesheets/avo.css

@@ -1,7 +1,6 @@
 @import './../../../node_modules/simplemde/dist/simplemde.min.css';
 @import './../../../node_modules/tippy.js/dist/tippy.css';
 @import './../../../node_modules/tippy.js/themes/light.css';
-@import './../../../node_modules/trix/dist/trix.css';
 @import './../../../node_modules/flatpickr/dist/flatpickr.css';
 @import './../../../node_modules/@algolia/autocomplete-theme-classic/dist/theme.css';
 @import './../../../node_modules/@yaireo/tagify/dist/tagify.css';
@@ -20,9 +19,10 @@
 @import './css/spinner.css';
 @import './css/tags.css';
 
-@import './css/components/status.css';
-@import './css/components/code.css';
-@import './css/components/progress.css';
+@import './css/fields/status.css';
+@import './css/fields/code.css';
+@import './css/fields/progress.css';
+@import './css/fields/trix.css';
 
 @import 'tailwindcss/components';
 

data/app/assets/stylesheets/css/fields/trix.css

@@ -0,0 +1,17 @@
+@import './../../../../../node_modules/trix/dist/trix.css';
+
+.trix-content h1 {
+  @apply text-xl font-bold mb-2;
+}
+
+.trix-content ul {
+  @apply list-disc;
+}
+
+.trix-content pre {
+  @apply text-base;
+}
+
+.trix-content ol {
+  @apply list-decimal;
+}

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

@@ -4,6 +4,7 @@
   data-actions-picker-disabled-class="cursor-wait text-gray-500"
 >
   <%= a_button style: :outline,
+    type: :button,
     color: :primary,
     class: "focus:outline-none",
     icon: 'arrow-circle-right',
@@ -18,24 +19,15 @@
   >
     <div class="w-full space divide-y">
       <% @actions.each_with_index do |action, index| %>
-        <%
-          path = action_name == 'show' ?
-            "#{@resource.record_path}/actions/#{action.param_id}" :
-            "#{@resource.records_path}/actions/#{action.param_id}"
-          if action_name == 'show' || action.standalone
-            disabled = false
-          else
-            disabled = true
-          end
-        %>
-        <%= link_to path,
+        <%= link_to action_path(action.param_id),
           data: {
             'turbo-frame': 'actions_show',
             'action': 'click->actions-picker#visitAction',
             'actions-picker-target': action.standalone ? 'standaloneAction' : 'resourceAction',
-            'disabled': disabled,
+            'disabled': is_disabled?(action),
           },
-          class: "flex items-center px-4 py-3 w-full font-semibold text-sm #{disabled ? 'text-gray-500' : 'text-black hover:bg-blue-500 hover:text-white'}" do %>
+          title: action.action_name,
+          class: "flex items-center px-4 py-3 w-full font-semibold text-sm #{is_disabled?(action) ? 'text-gray-500' : 'text-black hover:bg-blue-500 hover:text-white'}" do %>
           <%= svg 'play', class: 'h-5 mr-1 inline' %> <%= action.action_name %>
         <% end %>
       <% end %>

data/app/components/avo/actions_component.rb

@@ -3,12 +3,50 @@
 class Avo::ActionsComponent < ViewComponent::Base
   include Avo::ApplicationHelper
 
-  def initialize(actions: [], resource: nil)
+  def initialize(actions: [], resource: nil, view: nil)
     @actions = actions
     @resource = resource
+    @view = view
   end
 
   def render?
     @actions.present?
   end
+
+  # When running an action for one record we should do it on a special path.
+  # We do that so we get the `model` param inside the action so we can prefill fields.
+  def action_path(id)
+    return many_records_path(id) unless @resource.has_model_id?
+
+    if on_record_page?
+      single_record_path id
+    else
+      many_records_path id
+    end
+  end
+
+  # How should the action be displayed by default
+  def is_disabled?(action)
+    return false if action.standalone
+
+    on_index_page?
+  end
+
+  private
+
+  def on_record_page?
+    @view.in?([:show, :edit, :new])
+  end
+
+  def on_index_page?
+    !on_record_page?
+  end
+
+  def single_record_path(id)
+    "#{@resource.record_path}/actions/#{id}"
+  end
+
+  def many_records_path(id)
+    "#{@resource.records_path}/actions/#{id}"
+  end
 end

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

@@ -13,7 +13,7 @@
       <% else %>
         <%= @field.name %>
       <% end %>
-      <% if @field.required %> <span class="text-red-600 ml-1">*</span> <% end %>
+      <% if @field.is_required? %> <span class="text-red-600 ml-1">*</span> <% end %>
     </div>
   </div>
   <div class="flex-1 flex flex-row md:min-h-inherit py-2 <% unless @displayed_in_modal %> px-6 <% end %>">

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

@@ -50,6 +50,6 @@ class Avo::Fields::BelongsToField::EditComponent < Avo::Fields::EditComponent
   end
 
   def field_html_action
-    @field.get_html(:data, view: @resource.view, element: :input)
+    @field.get_html(:data, view: @resource.view, element: :input).fetch(:action, nil)
   end
 end

data/app/components/avo/fields/trix_field/edit_component.html.erb

@@ -12,6 +12,7 @@
     class="relative block overflow-x-auto max-w-full"
   >
     <%= content_tag 'trix-editor',
+      class: 'trix-content',
       data: {
         "trix-field-target": "editor",
         **@field.get_html(:data, view: view, element: :input)

data/app/components/avo/fields/trix_field/show_component.html.erb

@@ -1,6 +1,6 @@
 <%= show_field_wrapper field: @field, resource: @resource, index: @index do %>
   <%
-    content_classes = 'prose prose-sm'
+    content_classes = 'trix-content py-2'
     content_classes << ' hidden' unless @field.always_show
   %>
   <div data-controller="hidden-input">

data/app/components/avo/sidebar/item_switcher_component.html.erb

@@ -2,10 +2,10 @@
   <%= render Avo::Sidebar::LinkComponent.new label: item.name, path: item.path, target: item.target %>
 <% end %>
 <% if item.is_a? Avo::Menu::Resource %>
-  <%= render Avo::Sidebar::LinkComponent.new label: resource.navigation_label, path: helpers.resources_path(resource: resource) %>
+  <%= render Avo::Sidebar::LinkComponent.new label: item.navigation_label, path: helpers.resources_path(resource: resource) %>
 <% end %>
 <% if item.is_a? Avo::Menu::Dashboard %>
-  <%= render Avo::Sidebar::LinkComponent.new label: dashboard.navigation_label, path: dashboard.navigation_path %>
+  <%= render Avo::Sidebar::LinkComponent.new label: item.navigation_label, path: dashboard.navigation_path %>
 <% end %>
 <% if item.is_a? Avo::Menu::Section %>
   <%= render Avo::Sidebar::SectionComponent.new item: item %>

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

@@ -2,23 +2,25 @@
   class: "space-y-12",
   data: {
     'model-id': @resource.model.id,
+    selected_resources_name: @resource.model_key,
+    selected_resources: [@resource.model.id],
     **@resource.stimulus_data_attributes
   } do %>
-  <% @resource.panels.each do |resource_panel| %>
+  <% @resource.panels.each_with_index do |resource_panel, index| %>
     <%= form_with model: @resource.model,
         scope: @resource.form_scope,
-        url: helpers.resource_path(model: @resource.model, resource: @resource),
-        method: :put,
+        url: form_url,
         local: true,
         multipart: true do |form| %>
       <%= render Avo::ReferrerParamsComponent.new back_path: back_path %>
-      <%= render Avo::PanelComponent.new(title: resource_panel[:name], description: @resource.resource_description, display_breadcrumbs: true) do |c| %>
+      <%= render Avo::PanelComponent.new(title: resource_panel[:name], description: @resource.resource_description, display_breadcrumbs: true, index: index) do |c| %>
         <% c.tools do %>
           <%= a_link back_path,
             style: :text,
             icon: 'arrow-left' do %>
             <%= t('avo.cancel').capitalize %>
           <% end %>
+          <%= render Avo::ActionsComponent.new actions: @actions, resource: @resource, view: @view %>
           <% if can_see_the_save_button? %>
             <%= a_button color: :primary,
               style: :primary,

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,7 +21,11 @@ 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
 
@@ -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,6 +5,7 @@ module Avo
 
     include ActionView::Helpers::UrlHelper
     include Avo::Concerns::HasTools
+    include Avo::Concerns::HasModel
     include Avo::Concerns::HasFields
     include Avo::Concerns::HasStimulusControllers
 
@@ -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