avo 1.19.0 → 1.19.1.pre.4

data/app/assets/config/avo_manifest.js

@@ -1 +1,2 @@
-//= link_directory ../stylesheets/avo .css
+//= link_directory ../images/avo
+//= link_tree ../builds

data/app/{packs/entrypoints/application.css → assets/stylesheets/avo.css}

@@ -6,25 +6,26 @@
 @import './../../../node_modules/flatpickr/dist/flatpickr.css';
 @import './../../../node_modules/@algolia/autocomplete-theme-classic/dist/theme.css';
 
-@import './../stylesheets/tailwindcss/base.css';
-
-@import './../stylesheets/fonts.css';
-@import './../stylesheets/typography.css';
-@import './../stylesheets/tooltips.css';
-@import './../stylesheets/alerts.css';
-@import './../stylesheets/loader.css';
-@import './../stylesheets/pagination.css';
-@import './../stylesheets/breadcrumbs.css';
-@import './../stylesheets/search.css';
-@import './../stylesheets/active-storage.css';
-@import './../stylesheets/spinner.css';
-
-@import './../stylesheets/components/status.css';
-@import './../stylesheets/components/code.css';
-@import './../stylesheets/components/progress.css';
-@import './../stylesheets/tailwindcss/components.css';
-
-@import './../stylesheets/tailwindcss/utilities.css';
+@import 'tailwindcss/base';
+
+@import './css/fonts.css';
+@import './css/typography.css';
+@import './css/tooltips.css';
+@import './css/alerts.css';
+@import './css/loader.css';
+@import './css/pagination.css';
+@import './css/breadcrumbs.css';
+@import './css/search.css';
+@import './css/active-storage.css';
+@import './css/spinner.css';
+
+@import './css/components/status.css';
+@import './css/components/code.css';
+@import './css/components/progress.css';
+
+@import 'tailwindcss/components';
+
+@import 'tailwindcss/utilities';
 
 html,
 body {
@@ -67,11 +68,9 @@ body {
   @apply opacity-0 translate-y-1;
 }
 
-.application-sidebar {
-  .active:hover,
-  .active {
-    @apply bg-gray-200;
-  }
+.application-sidebar .active:hover,
+.application-sidebar .active {
+  @apply bg-gray-200;
 }
 
 .turbo-progress-bar {

data/app/assets/stylesheets/css/fonts.css

@@ -0,0 +1,26 @@
+/* nunito-regular - latin */
+@font-face {
+  font-family: 'Nunito';
+  font-style: normal;
+  font-weight: 400;
+  src: url('/avo-assets/fonts/nunito-v16-latin-regular.eot'); /* IE9 Compat Modes */
+  src: local(''),
+      url('/avo-assets/fonts/nunito-v16-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+      url('/avo-assets/fonts/nunito-v16-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
+      url('/avo-assets/fonts/nunito-v16-latin-regular.woff') format('woff'), /* Modern Browsers */
+      url('/avo-assets/fonts/nunito-v16-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
+      url('/avo-assets/fonts/nunito-v16-latin-regular.svg#Nunito') format('svg'); /* Legacy iOS */
+}
+/* nunito-700 - latin */
+@font-face {
+  font-family: 'Nunito';
+  font-style: normal;
+  font-weight: 700;
+  src: url('/avo-assets/fonts/nunito-v16-latin-700.eot'); /* IE9 Compat Modes */
+  src: local(''),
+      url('/avo-assets/fonts/nunito-v16-latin-700.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+      url('/avo-assets/fonts/nunito-v16-latin-700.woff2') format('woff2'), /* Super Modern Browsers */
+      url('/avo-assets/fonts/nunito-v16-latin-700.woff') format('woff'), /* Modern Browsers */
+      url('/avo-assets/fonts/nunito-v16-latin-700.ttf') format('truetype'), /* Safari, Android, iOS */
+      url('/avo-assets/fonts/nunito-v16-latin-700.svg#Nunito') format('svg'); /* Legacy iOS */
+}

data/app/components/avo/resource_component.rb

@@ -25,10 +25,6 @@ class Avo::ResourceComponent < ViewComponent::Base
 
   private
 
-  def simple_relation?
-    @reflection.is_a? ::ActiveRecord::Reflection::HasManyReflection
-  end
-
   def relation_resource
     ::Avo::App.get_resource_by_model_name params[:via_resource_class].safe_constantize
   end

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

@@ -10,7 +10,7 @@
               <%= helpers.svg 'arrow-left' %> <%= t('avo.cancel').capitalize %>
             <% end %>
 
-            <% if @resource.authorization.authorize_action :update, raise_exception: false %>
+            <% if can_see_the_save_button? %>
               <%= a_button color: 'green', variant: 'outlined', spinner: true, type: :submit do %>
                 <%= helpers.svg 'save' %> <%= t('avo.save').capitalize %>
               <% end %>

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

@@ -16,6 +16,12 @@ class Avo::Views::ResourceEditComponent < Avo::ResourceComponent
     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
+  end
+
   private
 
   def via_resource?

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

@@ -3,7 +3,7 @@
     <% c.tools do %>
       <%= render 'actions' if @actions.present? %>
 
-      <% if can_create? %>
+      <% if can_see_the_create_button? %>
         <%= a_link create_path do %>
           <%= svg 'plus' %> <%= t('avo.create_new_item', item: singular_resource_name.downcase ) %>
         <% end %>

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

@@ -44,8 +44,10 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
     @index_params[:available_view_types]
   end
 
-  def can_create?
-    @resource.authorization.authorize_action(:create, raise_exception: false) && simple_relation? && !has_reflection_and_is_read_only
+  # The Create button is dependent on the new? policy method.
+  # The create? should be called only when the user clicks the Save button so the developers gets access to the params from the form.
+  def can_see_the_create_button?
+    @resource.authorization.authorize_action(:new, raise_exception: false) && !has_reflection_and_is_read_only
   end
 
   def can_attach?
@@ -58,7 +60,7 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
   def has_reflection_and_is_read_only
     if @reflection.present? && @reflection.active_record.name && @reflection.name
       fields = ::Avo::App.get_resource_by_model_name(@reflection.active_record.name).get_field_definitions
-      filtered_fields = fields.filter{ |f| f.id == @reflection.name}
+      filtered_fields = fields.filter { |f| f.id == @reflection.name }
     else
       return false
     end
@@ -75,10 +77,22 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
 
     if @reflection.present?
       args = {
-        via_relation_class: @parent_model.model_name,
-        via_resource_id: @parent_model.id
+        via_relation_class: reflection_model_class,
+        via_resource_id: @parent_model.id,
       }
 
+      if @reflection.is_a? ActiveRecord::Reflection::ThroughReflection
+        args[:via_relation] = params[:resource_name]
+      end
+
+      if @reflection.is_a? ActiveRecord::Reflection::HasManyReflection
+        args[:via_relation] = @reflection.name
+      end
+
+      if @reflection.parent_reflection.present? && @reflection.parent_reflection.inverse_of.present?
+        args[:via_relation] = @reflection.parent_reflection.inverse_of.name
+      end
+
       if @reflection.inverse_of.present?
         args[:via_relation] = @reflection.inverse_of.name
       end
@@ -101,9 +115,7 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
 
   private
 
-  def simple_relation?
-    return @reflection.is_a? ::ActiveRecord::Reflection::HasManyReflection if @reflection.present?
-
-    true
+  def reflection_model_class
+    @reflection.active_record.to_s
   end
 end

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

@@ -1,6 +1,6 @@
 <div>
   <% @resource.panels.each do |resource_panel| %>
-    <%= form_with model: @resource.model, url: helpers.resources_path(resource: @resource, via_relation_class: params[:via_relation_class], via_resource_id: params[:via_resource_id]), local: true, multipart: true do |form| %>
+    <%= form_with model: @resource.model, url: helpers.resources_path(resource: @resource, via_relation_class: params[:via_relation_class], via_relation: params[:via_relation], via_resource_id: params[:via_resource_id]), local: true, multipart: true do |form| %>
       <%= render Avo::PanelComponent.new(title: resource_panel[:name], display_breadcrumbs: true) do |c| %>
         <% c.tools do %>
           <div class="flex justify-end space-x-2">
@@ -8,9 +8,11 @@
               <%= svg 'arrow-left' %> <%= t('avo.cancel').capitalize %>
             <% end %>
 
-            <%= a_button color: 'green', spinner: true, type: :submit do %>
-              <%= svg 'save' %> <%= t('avo.save').capitalize %>
-            <% end if @resource.authorization.authorize_action :create, raise_exception: false %>
+            <% if can_see_the_save_button? %>
+              <%= a_button color: 'green', spinner: true, type: :submit do %>
+                <%= svg 'save' %> <%= t('avo.save').capitalize %>
+              <% end %>
+            <% end %>
           </div>
         <% end %>
 

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

@@ -20,6 +20,12 @@ class Avo::Views::ResourceNewComponent < ViewComponent::Base
     end
   end
 
+  # The create button is dependent on the new? policy method.
+  # The create? should be called only when the user clicks the Save button so the developers gets access to the params from the form.
+  def can_see_the_save_button?
+    @resource.authorization.authorize_action :new, raise_exception: false
+  end
+
   private
 
   def via_resource?

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

@@ -14,7 +14,7 @@
                 <%= svg 'trash' %> <%= t('avo.detach_item', item: @reflection.name.to_s).capitalize %>
               <% end %>
             <% end %>
-            <% if @resource.authorization.authorize_action(:edit, raise_exception: false) %>
+            <% if can_see_the_edit_button? %>
               <%= a_link edit_path, color: 'indigo' do %>
                 <%= svg 'edit' %> <%= t('avo.edit').capitalize %>
               <% end %>
@@ -24,7 +24,7 @@
               <%= svg 'arrow-left' %> <%= t('avo.go_back') %>
             <% end %>
 
-            <% if @resource.authorization.authorize_action(:destroy, raise_exception: false) %>
+            <% if can_see_the_destroy_button? %>
               <%= form_with url: helpers.resource_path(model: @resource.model, resource: @resource), method: :delete, html: { 'data-turbo-frame': params[:turbo_frame] } do |form| %>
                 <%= a_button title: t('avo.delete_item', item: @resource.model.model_name.name.downcase).capitalize,
                   spinner: true,

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

@@ -43,7 +43,15 @@ class Avo::Views::ResourceShowComponent < Avo::ResourceComponent
   end
 
   def can_detach?
-    authorize_association_for('detach')
+    authorize_association_for("detach")
+  end
+
+  def can_see_the_edit_button?
+    @resource.authorization.authorize_action(:edit, raise_exception: false)
+  end
+
+  def can_see_the_destroy_button?
+    @resource.authorization.authorize_action(:destroy, raise_exception: false)
   end
 
   private

data/app/controllers/avo/application_controller.rb

@@ -12,6 +12,8 @@ module Avo
     before_action :_authenticate!
     before_action :set_container_classes
     before_action :add_initial_breadcrumbs
+    before_action :set_view
+    before_action :set_model_to_fill
 
     rescue_from Pundit::NotAuthorizedError, with: :render_unauthorized
     rescue_from ActiveRecord::RecordInvalid, with: :exception_logger
@@ -99,6 +101,19 @@ module Avo
       @related_model = eager_load_files(@related_resource, @related_resource.class.find_scope).find params[:related_id]
     end
 
+    def set_view
+      @view = action_name.to_sym
+    end
+
+    def set_model_to_fill
+      @model_to_fill = @resource.model_class.new if @view == :create
+      @model_to_fill = @model if @view == :update
+    end
+
+    def fill_model
+      @model = @resource.fill_model(@model_to_fill, cast_nullable(model_params))
+    end
+
     def hydrate_resource
       @resource.hydrate(view: action_name.to_sym, user: _current_user)
     end

data/app/controllers/avo/base_controller.rb

@@ -5,13 +5,13 @@ module Avo
     before_action :set_resource_name
     before_action :set_resource
     before_action :hydrate_resource
-    before_action :authorize_action
     before_action :set_model, only: [:show, :edit, :destroy, :update]
+    before_action :set_model_to_fill
+    before_action :authorize_action
     before_action :reset_pagination_if_filters_changed, only: :index
     before_action :cache_applied_filters, only: :index
 
     def index
-      @view = :index
       @page_title = resource_name.humanize
       add_breadcrumb resource_name.humanize
 
@@ -24,8 +24,8 @@ module Avo
         @query = @resource.class.query_scope
       end
 
-      # Remove default_scope for index view
-      if @resource.unscoped_queries_on_index
+      # Remove default_scope for index view if no parent_resource present
+      if @resource.unscoped_queries_on_index && @parent_resource.blank?
         @query = @query.unscoped
       end
 
@@ -59,7 +59,6 @@ module Avo
     end
 
     def show
-      @view = :show
       set_actions
 
       @resource = @resource.hydrate(model: @model, view: :show, user: _current_user, params: params)
@@ -82,7 +81,6 @@ module Avo
     end
 
     def new
-      @view = :new
       @model = @resource.model_class.new
       @resource = @resource.hydrate(model: @model, view: :new, user: _current_user)
 
@@ -92,7 +90,6 @@ module Avo
     end
 
     def edit
-      @view = :edit
       @resource = @resource.hydrate(model: @model, view: :edit, user: _current_user)
 
       @page_title = @resource.default_panel_name
@@ -114,20 +111,50 @@ module Avo
     end
 
     def create
-      @model = @resource.fill_model(@resource.model_class.new, cast_nullable(model_params))
+      # model gets instantiated and filled in the fill_model method
+      fill_model
       saved = @model.save
       @resource.hydrate(model: @model, view: :new, user: _current_user)
 
+      # This means that the record has been created through another parent record and we need to attach it somehow.
+      if params[:via_resource_id].present?
+        @reflection = @model._reflections[params[:via_relation]]
+        # Figure out what kind of association does the record have with the parent record
+
+        # belongs_to
+        # has_many
+        # Get the foreign key and set it to the id we received in the params
+        if @reflection.is_a?(ActiveRecord::Reflection::BelongsToReflection) || @reflection.is_a?(ActiveRecord::Reflection::HasManyReflection)
+          foreign_key = @reflection.foreign_key
+          @model.send("#{foreign_key}=", params[:via_resource_id])
+          @model.save
+        end
+
+        # has_one
+        # has_one_through
+
+        # has_many_through
+        # has_and_belongs_to_many
+        # polymorphic
+        if @reflection.is_a? ActiveRecord::Reflection::ThroughReflection
+          # find the record
+          via_resource = ::Avo::App.get_resource_by_model_name params[:via_relation_class]
+          @related_record = via_resource.model_class.find params[:via_resource_id]
+
+          @model.send(params[:via_relation]) << @related_record
+        end
+      end
+
       respond_to do |format|
         if saved
-          redirect_path = if params[:via_relation_class].present? && params[:via_resource_id].present?
+          redirect_path = resource_path(model: @model, resource: @resource)
+
+          if params[:via_relation_class].present? && params[:via_resource_id].present?
             parent_resource = ::Avo::App.get_resource_by_model_name params[:via_relation_class].safe_constantize
-            resource_path(model: params[:via_relation_class].safe_constantize, resource: parent_resource, resource_id: params[:via_resource_id])
-          else
-            resource_path(model: @model, resource: @resource)
+            redirect_path = resource_path(model: params[:via_relation_class].safe_constantize, resource: parent_resource, resource_id: params[:via_resource_id])
           end
 
-          format.html { redirect_to redirect_path, notice: "#{@model.class.name} was successfully created." }
+          format.html { redirect_to redirect_path, notice: "#{@model.class.name} #{t("avo.was_successfully_created")}." }
           format.json { render :show, status: :created, location: @model }
         else
           flash[:error] = t "avo.you_missed_something_check_form"
@@ -138,13 +165,14 @@ module Avo
     end
 
     def update
-      @model = @resource.fill_model(@model, cast_nullable(model_params))
+      # model gets instantiated and filled in the fill_model method
+      fill_model
       saved = @model.save
       @resource = @resource.hydrate(model: @model, view: :edit, user: _current_user)
 
       respond_to do |format|
         if saved
-          format.html { redirect_to params[:referrer] || resource_path(model: @model, resource: @resource), notice: "#{@model.class.name} was successfully updated." }
+          format.html { redirect_to params[:referrer] || resource_path(model: @model, resource: @resource), notice: "#{@model.class.name} #{t("avo.was_successfully_updated")}." }
           format.json { render :show, status: :ok, location: @model }
         else
           flash[:error] = t "avo.you_missed_something_check_form"

data/app/helpers/avo/application_helper.rb

@@ -1,18 +1,7 @@
 module Avo
   module ApplicationHelper
-    include ::Manifester::Helper
     include ::Pagy::Frontend
 
-    def current_webpacker_instance
-      return Avo.webpacker if Avo::IN_DEVELOPMENT
-
-      super
-    end
-
-    def current_manifester_instance
-      Avo.manifester
-    end
-
     def render_license_warnings
       render partial: "avo/sidebar/license_warnings", locals: {
         license: Avo::App.license.properties
@@ -116,7 +105,7 @@ module Avo
       options[:class] += args[:extra_class].present? ? " #{args[:extra_class]}" : ""
 
       # Create the path to the svgs directory
-      file_path = "#{Avo::Engine.root}/app/packs/svgs/#{file_name}"
+      file_path = "#{Avo::Engine.root}/app/assets/svgs/#{file_name}"
       file_path = "#{file_path}.svg" unless file_path.end_with? ".svg"
 
       # Create a cache hash