avo 1.19.1.pre.3 → 1.19.1.pre.7

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,13 +68,19 @@ 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 {
   @apply bg-green-500;
 }
+
+body.os-mac .mac\:hidden {
+  display: none;
+}
+
+body.os-pc .pc\:hidden {
+  display: none;
+}

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/{packs/stylesheets → assets/stylesheets/css}/search.css

@@ -27,7 +27,7 @@
 
 .aa-DetachedFormContainer,
 .aa-DetachedContainer .aa-Panel {
-  @apply bg-blue-gray-100 border-b-0;
+  @apply bg-slate-100 border-b-0;
 }
 
 .aa-Form {

data/app/components/avo/edit/field_wrapper_component.html.erb

@@ -1,5 +1,5 @@
 <div class="flex items-center py-0 leading-tight <%= @classes %> min-h-16" data-field-id="<%= @field.id %>" data-field-type="<%= @field.type %>">
-  <div class="h-16 flex self-start items-center text-blue-gray-800">
+  <div class="h-16 flex self-start items-center text-slate-800">
     <div class="<% if @displayed_in_modal %> md:w-48 <% else %> md:w-64 <% end %> w-48 px-8 flex" data-slot="label">
       <%= @form.label @field.id, label %> <% if @field.required %> <span class="text-red-600">*</span> <% end %>
     </div>

data/app/components/avo/fields/common/files_list_viewer_component.html.erb

@@ -1,4 +1,4 @@
-<div class="relative p-3 bg-blue-gray-200 grid grid-cols-3 xl:grid-cols-4 gap-3 rounded-xl">
+<div class="relative p-3 bg-slate-200 grid grid-cols-3 xl:grid-cols-4 gap-3 rounded-xl">
   <% @field.value.attachments.each do |file| %>
     <%= render Avo::Fields::Common::MultipleFileViewerComponent.new id: @field.id, file: file, is_image: @field.is_image, button_size: :xs, resource: @resource %>
   <% end %>

data/app/components/avo/fields/common/heading_component.html.erb

@@ -1,4 +1,4 @@
-<div class="flex items-start py-1 leading-tight border-t bg-blue-gray-600 text-white text-xs">
+<div class="flex items-start py-1 leading-tight border-t bg-slate-600 text-white text-xs">
   <div class="p-3 pl-6 h-full w-full">
     <% if @value.present? %>
       <% if @as_html %>

data/app/components/avo/index/field_wrapper_component.html.erb

@@ -1,4 +1,4 @@
-<td class="px-4 py-2 leading-tight whitespace-nowrap h-12 text-blue-gray-800 <%= @classes %>" data-field-id="<%= @field.id %>" data-field-type="<%= @field.type %>">
+<td class="px-4 py-2 leading-tight whitespace-nowrap h-12 text-slate-800 <%= @classes %>" data-field-id="<%= @field.id %>" data-field-type="<%= @field.type %>">
   <% if @field.value.blank? && @dash_if_blank %>
     —
   <% else %>

data/app/components/avo/index/table_row_component.html.erb

@@ -1,5 +1,5 @@
 <tr
-  class="hover:bg-light-blue-50 hover:shadow-row relative z-20 border-b"
+  class="hover:bg-sky-50 hover:shadow-row relative z-20 border-b"
   <%== item_selector_init @resource %>
 >
   <td class="w-10">

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/show/field_wrapper_component.html.erb

@@ -1,5 +1,5 @@
 <div class="flex items-start leading-tight <%= @classes %> min-h-16" data-field-id="<%= @field.id %>" data-field-type="<%= @field.type %>">
-  <div class="h-16 flex self-start items-center text-blue-gray-800">
+  <div class="h-16 flex self-start items-center text-slate-800">
     <div class="w-48 md:w-64 px-8" data-slot="label">
       <%= @field.name %> <% if @field.required %> <span class="text-red-600">*</span> <% end %>
     </div>

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

@@ -47,7 +47,7 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
   # 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) && simple_relation? && !has_reflection_and_is_read_only
+    @resource.authorization.authorize_action(:new, raise_exception: false) && !has_reflection_and_is_read_only
   end
 
   def can_attach?
@@ -60,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
@@ -77,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
@@ -103,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">

data/app/controllers/avo/base_controller.rb

@@ -7,7 +7,6 @@ module Avo
     before_action :hydrate_resource
     before_action :set_model, only: [:show, :edit, :destroy, :update]
     before_action :set_model_to_fill
-    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
@@ -25,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
 
@@ -112,17 +111,47 @@ module Avo
     end
 
     def create
-      # model gets instantiated and filled in the fill_model before_action
+      # 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} #{t("avo.was_successfully_created")}." }
@@ -136,7 +165,8 @@ module Avo
     end
 
     def update
-      # model gets instantiated and filled in the fill_model before_action
+      # 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)
 

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
@@ -40,8 +29,7 @@ module Avo
     def a_button(label = nil, **args, &block)
       args[:class] = button_classes(args[:class], color: args[:color], variant: args[:variant], size: args[:size])
       if args[:spinner]
-        args["data-controller"] = "loading-button"
-        # args["data-action"] = "click->loading-button#onClick"
+        args[:"data-controller"] = "loading-button"
       end
 
       locals = {
@@ -116,7 +104,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
@@ -146,12 +134,12 @@ module Avo
     end
 
     def input_classes(extra_classes = "", has_error: false)
-      classes = "appearance-none inline-flex bg-blue-gray-100 disabled:bg-blue-gray-300 disabled:cursor-not-allowed focus:bg-white text-blue-gray-700 disabled:text-blue-gray-700 rounded-md py-2 px-3 leading-tight border outline-none outline"
+      classes = "appearance-none inline-flex bg-slate-100 disabled:bg-slate-300 disabled:cursor-not-allowed focus:bg-white text-slate-700 disabled:text-slate-700 rounded-md py-2 px-3 leading-tight border outline-none outline"
 
       classes += if has_error
         " border-red-600"
       else
-        " border-blue-gray-300"
+        " border-slate-300"
       end
 
       classes += " #{extra_classes}"

data/app/{packs/entrypoints/application.js → javascript/avo.js}

@@ -4,15 +4,14 @@ import 'core-js/stable'
 import 'regenerator-runtime/runtime'
 import * as ActiveStorage from '@rails/activestorage'
 import * as Mousetrap from 'mousetrap'
-import { Application } from 'stimulus'
 import { Turbo } from '@hotwired/turbo-rails'
-import { definitionsFromContext } from 'stimulus/webpack-helpers'
 import Rails from '@rails/ujs'
 import tippy from 'tippy.js'
 
 // Toastr alerts
-import '../js/active-storage'
-import '../js/toastr'
+import './js/active-storage'
+import './js/controllers'
+import './js/toastr'
 
 Rails.start()
 
@@ -20,6 +19,17 @@ window.Turbolinks = Turbo
 
 Mousetrap.bind('r r r', () => Turbo.visit(window.location.href, { action: 'replace' }))
 
+function isMac() {
+  const isMac = window.navigator.userAgent.indexOf('Mac OS X')
+
+  if (isMac) {
+    document.body.classList.add('os-mac')
+    document.body.classList.remove('os-pc')
+  } else {
+    document.body.classList.add('os-pc')
+    document.body.classList.remove('os-mac')
+  }
+}
 function initTippy() {
   tippy('[data-tippy="tooltip"]', {
     theme: 'light',
@@ -33,18 +43,12 @@ function initTippy() {
 }
 window.initTippy = initTippy
 
-const application = Application.start()
 ActiveStorage.start()
 
-const context = require.context('./../js/controllers', true, /\.js$/)
-application.load(definitionsFromContext(context))
-
-const fieldsContext = require.context('./../js/controllers/fields', true, /\.js$/)
-application.load(definitionsFromContext(fieldsContext))
-
 document.addEventListener('turbo:load', () => {
   document.body.classList.remove('turbo-loading')
   initTippy()
+  isMac()
 })
 
 document.addEventListener('turbo:before-fetch-response', (e) => {
@@ -58,10 +62,3 @@ document.addEventListener('turbo:submit-start', () => document.body.classList.ad
 document.addEventListener('turbo:before-cache', () => {
   document.querySelectorAll('[data-turbo-remove-before-cache]').forEach((element) => element.remove())
 })
-
-// Uncomment to copy all static images under ../images to the output folder and reference
-// them with the image_pack_tag helper in views (e.g <%= image_pack_tag 'rails.png' %>)
-// or the `imagePath` JavaScript helper below.
-//
-const images = require.context('../images', true)
-const imagePath = (name) => images(name, true)

data/app/javascript/js/application.js

@@ -0,0 +1,9 @@
+import { Application } from 'stimulus'
+
+const application = Application.start()
+
+// Configure Stimulus development experience
+application.debug = false
+window.Stimulus = application
+
+export { application }

data/app/{packs → javascript}/js/controllers/action_controller.js

@@ -1,5 +1,5 @@
 import { Controller } from 'stimulus'
-import { castBoolean } from '@/js/helpers/cast_boolean'
+import { castBoolean } from '../helpers/cast_boolean'
 
 export default class extends Controller {
   static targets = ['controllerDiv', 'resourceIds', 'form']