avo 3.0.1.beta19 → 3.0.1.beta20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46cef6a1b4b4c683dfdf890bd2f5b4471409639056c4f418d5aa3c325255da60
-  data.tar.gz: 9df43b34fcb9a8319349aa70b373ed844a11062efbb0b4341e80dac493a142d4
+  metadata.gz: 024a9e280e4e0a908ebcbb16244dfd1bfc4e659c5d11378799acddd7306f82ab
+  data.tar.gz: cf20e9467319e4cd70f6a007f6297b56be3b7b3d54ce7b6d464ec5c6d0a2057f
 SHA512:
-  metadata.gz: 75a6b6e928e9f45eb39575d7eecb73808db11bb4bb257d66c594cecd118d6646e469a79dbe337e28e463959100d5bc84212192c7c98989869ab2656af0d46258
-  data.tar.gz: c65740c8289301265234a146acc87b99909a41261dcab24c5fe7c36520a911a1dba6ecd3a8538bb961ec5d82d6e13529cc36328e26981cf4320c5ba855aa67f6
+  metadata.gz: 504136d6d7357d717453565826a18117a6fc5b806f35e6633ad70e8521e7aa7fb0b6b4ef5df0433c0b7457abe0621102f4f4a144af0969d2803d0e9c9df84d81
+  data.tar.gz: 9c413b093b021377c6a9113470fec070f563696f8d66bcbc7305a0639af2326ae12e2d848f15f792958c2d2a1ea18168af5c632d04327588671caab102d0b556

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (3.0.1.beta19)
+    avo (3.0.1.beta20)
       actionview (>= 6.1)
       active_link_to
       activerecord (>= 6.1)

data/README.md

@@ -17,7 +17,7 @@ Avo is a beautiful next-generation framework that empowers you, the developer, t
 ✨ **Website**: [avohq.io](https://avohq.io)\
 📚 **Documentation**: [docs.avohq.io](https://docs.avohq.io)\
 🗺 **Roadmap**: [GitHub Roadmap](https://github.com/orgs/avo-hq/projects/3)\
-🎸 **Demo app**: [Avodemo](https://avodemo.herokuapp.com/)\
+🎸 **Demo app**: [Avodemo](https://main.avodemo.com/)\
 🐤 **Twitter**: [avo_hq](https://twitter.com/avo_hq)\
 💬 **Community chat**: [discord](https://discord.gg/pkTF6y8)\
 🔧 **Issue tracker**: [GitHub issues](http://github.com/avo-hq/avo/issues)\

data/app/assets/builds/avo.base.css

@@ -3393,7 +3393,7 @@ body.dark,body[data-theme=dark]{
   transition:inherit
 }
 
-/*! tailwindcss v3.3.3 | MIT License | https://tailwindcss.com
+/*! tailwindcss v3.3.2 | MIT License | https://tailwindcss.com
  */
 
 /*
@@ -3583,10 +3583,6 @@ select,
 textarea {
   font-family: inherit;
   /* 1 */
-  font-feature-settings: inherit;
-  /* 1 */
-  font-variation-settings: inherit;
-  /* 1 */
   font-size: 100%;
   /* 1 */
   font-weight: inherit;
@@ -3737,14 +3733,6 @@ menu {
   padding: 0;
 }
 
-/*
-Reset default styling for dialogs.
-*/
-
-dialog {
-  padding: 0;
-}
-
 /*
 Prevent resizing textareas horizontally by default.
 */
@@ -3819,7 +3807,7 @@ video {
   display: none;
 }
 
-[type='text'],input:where(:not([type])),[type='email'],[type='url'],[type='password'],[type='number'],[type='date'],[type='datetime-local'],[type='month'],[type='search'],[type='tel'],[type='time'],[type='week'],[multiple],textarea,select{
+[type='text'],[type='email'],[type='url'],[type='password'],[type='number'],[type='date'],[type='datetime-local'],[type='month'],[type='search'],[type='tel'],[type='time'],[type='week'],[multiple],textarea,select{
   appearance:none;
   background-color:#fff;
   border-color:#757D8A;
@@ -3834,7 +3822,7 @@ video {
   --tw-shadow:0 0 #0000;
 }
 
-[type='text']:focus, input:where(:not([type])):focus, [type='email']:focus, [type='url']:focus, [type='password']:focus, [type='number']:focus, [type='date']:focus, [type='datetime-local']:focus, [type='month']:focus, [type='search']:focus, [type='tel']:focus, [type='time']:focus, [type='week']:focus, [multiple]:focus, textarea:focus, select:focus{
+[type='text']:focus, [type='email']:focus, [type='url']:focus, [type='password']:focus, [type='number']:focus, [type='date']:focus, [type='datetime-local']:focus, [type='month']:focus, [type='search']:focus, [type='tel']:focus, [type='time']:focus, [type='week']:focus, [multiple]:focus, textarea:focus, select:focus{
   outline:2px solid transparent;
   outline-offset:2px;
   --tw-ring-inset:var(--tw-empty,/*!*/ /*!*/);
@@ -3857,17 +3845,7 @@ input::placeholder,textarea::placeholder{
 }
 
 ::-webkit-date-and-time-value{
-  min-height:1.5em;
-  text-align:inherit
-}
-
-::-webkit-datetime-edit{
-  display:inline-flex
-}
-
-::-webkit-datetime-edit,::-webkit-datetime-edit-year-field,::-webkit-datetime-edit-month-field,::-webkit-datetime-edit-day-field,::-webkit-datetime-edit-hour-field,::-webkit-datetime-edit-minute-field,::-webkit-datetime-edit-second-field,::-webkit-datetime-edit-millisecond-field,::-webkit-datetime-edit-meridiem-field{
-  padding-top:0;
-  padding-bottom:0
+  min-height:1.5em
 }
 
 select{
@@ -3877,24 +3855,24 @@ select{
   background-size:1.5em 1.5em;
   padding-right:2.5rem;
   -webkit-print-color-adjust:exact;
-          print-color-adjust:exact
+          color-adjust:exact
 }
 
-[multiple],[size]:where(select:not([size="1"])){
+[multiple]{
   background-image:initial;
   background-position:initial;
   background-repeat:unset;
   background-size:initial;
   padding-right:0.75rem;
   -webkit-print-color-adjust:unset;
-          print-color-adjust:unset
+          color-adjust:unset
 }
 
 [type='checkbox'],[type='radio']{
   appearance:none;
   padding:0;
   -webkit-print-color-adjust:exact;
-          print-color-adjust:exact;
+          color-adjust:exact;
   display:inline-block;
   vertical-align:middle;
   background-origin:border-box;
@@ -3976,7 +3954,6 @@ select{
 }
 
 [type='file']:focus{
-  outline:1px solid ButtonText;
   outline:1px auto -webkit-focus-ring-color
 }
 

data/app/components/avo/fields/common/badge_viewer_component.rb

@@ -17,7 +17,7 @@ class Avo::Fields::Common::BadgeViewerComponent < ViewComponent::Base
     background = :info
 
     @options.invert.each do |values, type|
-      if [values].flatten.map { |value| value }.include? @value
+      if [values].flatten.map { |value| value.to_s }.include? @value.to_s
         background = type.to_sym
         next
       end

data/app/components/avo/fields/common/files/list_viewer_component.rb

@@ -31,11 +31,11 @@ class Avo::Fields::Common::Files::ListViewerComponent < ViewComponent::Base
   end
 
   def view_type_component(file)
-    component = "Avo::Fields::Common::Files::ViewType::#{view_type.to_s.capitalize}Component".constantize
-    component.new(field: field, resource: resource, file: file)
+    component = "Avo::Fields::Common::Files::ViewType::#{view_type.to_s.capitalize}ItemComponent".constantize
+    component.new(field: field, resource: resource, file: file, extra_classes: "aspect-video")
   end
 
   def view_type
-    (resource.params.dig(:view_type) || field.view_type).to_sym
+    @view_type ||= (resource.params.dig(:view_type) || field.view_type).to_sym
   end
 end

data/app/components/avo/fields/common/files/view_type/{grid_component.html.erb → grid_item_component.html.erb}

@@ -1,8 +1,8 @@
 <div id="<%= dom_id file %>" class="relative min-h-full max-w-full flex-1 flex flex-col justify-between space-y-2">
   <% if file.present? %>
-    <div class="flex flex-col justify-between h-full">
+    <div class="flex h-full">
       <% if file.representable? && is_image? %>
-        <%= image_tag helpers.main_app.url_for(file), class: 'rounded-lg object-cover w-full aspect-video' %>
+        <%= image_tag helpers.main_app.url_for(file), class: "rounded-lg max-w-full #{@extra_classes}" %>
       <% elsif is_audio? %>
         <%= audio_tag(helpers.main_app.url_for(file), controls: true, preload: false, class: 'w-full') %>
       <% elsif is_video? %>

data/app/components/avo/fields/common/files/view_type/{grid_component.rb → grid_item_component.rb}

@@ -1,12 +1,13 @@
 # frozen_string_literal: true
 
-class Avo::Fields::Common::Files::ViewType::GridComponent < ViewComponent::Base
+class Avo::Fields::Common::Files::ViewType::GridItemComponent < ViewComponent::Base
   attr_reader :field, :resource
 
-  def initialize(field:, resource:, file: nil)
+  def initialize(field:, resource:, file: nil, extra_classes: nil)
     @file = file
     @field = field
     @resource = resource
+    @extra_classes = extra_classes
   end
 
   def id

data/app/components/avo/fields/common/files/view_type/{list_component.rb → list_item_component.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Avo::Fields::Common::Files::ViewType::ListComponent < Avo::Fields::Common::Files::ViewType::GridComponent
+class Avo::Fields::Common::Files::ViewType::ListItemComponent < Avo::Fields::Common::Files::ViewType::GridItemComponent
   def icon_for_file
     if is_image?
       "photo"

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

@@ -1,7 +1,7 @@
 <%= field_wrapper **field_wrapper_args do %>
   <% if @field.value.present? %>
     <div class="mb-2">
-      <%= render Avo::Fields::Common::Files::ViewType::GridComponent.new resource: @resource, field: @field %>
+      <%= render Avo::Fields::Common::Files::ViewType::GridItemComponent.new resource: @resource, field: @field %>
     </div>
   <% end %>
 

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

@@ -1,3 +1,3 @@
 <%= field_wrapper **field_wrapper_args do %>
-  <%= render Avo::Fields::Common::Files::ViewType::GridComponent.new resource: @resource, field: @field %>
+  <%= render Avo::Fields::Common::Files::ViewType::GridItemComponent.new resource: @resource, field: @field %>
 <% end %>

data/app/components/avo/index/resource_table_component.rb

@@ -21,9 +21,6 @@ class Avo::Index::ResourceTableComponent < ViewComponent::Base
       @query = @query.result
     end
 
-    Avo::Services::EncryptionService.encrypt(
-      message: Marshal.dump(@query),
-      purpose: :select_all
-    )
+    Avo::Services::EncryptionService.encrypt(message: @query, purpose: :select_all, serializer: Marshal)
   end
 end

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

@@ -6,10 +6,10 @@
   <div aria-expanded="true" role="dialog" aria-modal="true" class="modal-body rounded-lg inset-auto w-11/12 lg:w-1/2 sm:max-w-168 min-h-1/4 bg-white flex z-50 relative shadow-modal overflow-auto max-h-full">
     <div class="flex-1 flex flex-col justify-between">
       <div>
-        <div class="p-6 text-2xl tracking-normal font-semibold text-black">
+        <div class="p-6 pb-0 text-2xl tracking-normal font-semibold text-black">
           <%= heading %>
         </div>
-        <div class="px-6 text-base text-gray-500">
+        <div class="p-6 text-base text-gray-500">
           <%= content %>
         </div>
       </div>

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

@@ -186,7 +186,8 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
       association: "has_many",
       association_id: @reflection.name,
       class: reflection_model_class,
-      id: @parent_record.to_param
+      id: @parent_record.to_param,
+      view: @parent_resource.view
     }
   end
 

data/app/controllers/avo/actions_controller.rb

@@ -98,7 +98,7 @@ module Avo
     def decrypted_query
       return if (encrypted_query = action_params[:fields][:avo_selected_query]).blank?
 
-      Marshal.load(Avo::Services::EncryptionService.decrypt(message: encrypted_query, purpose: :select_all))
+      Avo::Services::EncryptionService.decrypt(message: encrypted_query, purpose: :select_all, serializer: Marshal)
     end
 
     def decrypted_arguments

data/app/controllers/avo/application_controller.rb

@@ -116,13 +116,17 @@ module Avo
     def set_resource
       raise ActionController::RoutingError.new "No route matches" if resource.nil?
 
-      @resource = resource.new(view: action_name.to_s, user: _current_user, params: params)
+      @resource = resource.new(view: params[:view] || action_name.to_s, user: _current_user, params: params)
 
       set_authorization
     end
 
+    def detect_fields
+      @resource.detect_fields
+    end
+
     def set_related_resource
-      @related_resource = related_resource.new(params: params, view: action_name.to_sym, user: _current_user, record: @related_record)
+      @related_resource = related_resource.new(params: params, view: action_name.to_sym, user: _current_user, record: @related_record).detect_fields
     end
 
     def set_record

data/app/controllers/avo/base_controller.rb

@@ -8,6 +8,7 @@ module Avo
     before_action :set_resource
     before_action :set_applied_filters, only: :index
     before_action :set_record, only: [:show, :edit, :destroy, :update, :preview]
+    before_action :detect_fields
     before_action :set_record_to_fill
     before_action :set_edit_title_and_breadcrumbs, only: [:edit, :update]
     before_action :fill_record, only: [:create, :update]

data/app/controllers/avo/search_controller.rb

@@ -156,8 +156,18 @@ module Avo
     end
 
     def fetch_field
-      fields = Avo.resource_manager.get_resource_by_model_class(params[:via_reflection_class]).new.get_field_definitions
-      fields.find { |f| f.id.to_s == params[:via_association_id] }
+      return if params[:via_association_id].nil?
+
+      reflection_resource = Avo.resource_manager.get_resource_by_model_class(params[:via_reflection_class]).new(
+        view: Avo::ViewInquirer.new(params[:via_reflection_view]),
+        record: parent,
+        params: params,
+        user: current_user
+      )
+
+      reflection_resource.detect_fields.get_field_definitions.find do |field|
+        field.id.to_s == params[:via_association_id]
+      end
     end
 
     def fetch_parent

data/app/javascript/js/controllers/search_controller.js

@@ -279,6 +279,8 @@ export default class extends Controller {
       via_reflection_class: this.dataset.viaReflectionClass,
       // eslint-disable-next-line camelcase
       via_reflection_id: this.dataset.viaReflectionId,
+      // eslint-disable-next-line camelcase
+      via_reflection_view: this.dataset.viaReflectionView,
     }
 
     return params

data/app/views/avo/actions/show.html.erb

@@ -25,7 +25,7 @@
       <%= form.hidden_field :avo_selected_query, 'data-action-target': 'selectedAllQuery' %>
       <%= form.hidden_field :arguments, value: params[:arguments] %>
       <% if @action.get_fields.present? %>
-        <div class="my-4 -mx-6">
+        <div class="mt-4 -mx-6">
           <% @action.get_fields.each_with_index do |field, index| %>
             <%= render field
               .hydrate(resource: @resource, record: @resource.record, user: @resource.user, view: @view)

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

@@ -8,6 +8,7 @@
       data-via-association-id="<%= via_reflection[:association_id] %>"
       data-via-reflection-class="<%= via_reflection[:class] %>"
       data-via-reflection-id="<%= via_reflection[:id] %>"
+      data-via-reflection-view="<%= via_reflection[:view] %>"
     <% end %>
   >
   </div>

data/lib/avo/base_resource.rb

@@ -244,8 +244,6 @@ module Avo
         hydrate_model_with_default_values if @view&.new?
       end
 
-      detect_fields
-
       unless self.class.model_class.present?
         if model_class.present? && model_class.respond_to?(:base_class)
           self.class.model_class = model_class.base_class
@@ -260,12 +258,30 @@ module Avo
       if temporary_items.present?
         instance_eval(&temporary_items)
       else
-        fields
+        fetch_fields
       end
 
       self
     end
 
+    def fetch_fields
+      possible_methods_for_view = {
+        index: [:index_fields, :display_fields],
+        show: [:show_fields, :display_fields],
+        edit: [:edit_fields, :form_fields],
+        update: [:edit_fields, :form_fields],
+        new: [:new_fields, :form_fields],
+        create: [:new_fields, :form_fields]
+      }[view.to_sym]
+
+      # Safe navigation operator is used because the view can be "destroy" or "preview"
+      possible_methods_for_view&.each do |method_for_view|
+        return send(method_for_view) if respond_to?(method_for_view)
+      end
+
+      fields
+    end
+
     def fields
       # blank fields method
     end

data/lib/avo/fields/has_base_field.rb

@@ -37,7 +37,7 @@ module Avo
       def frame_url
         Avo::Services::URIService.parse(field_resource.record_path)
           .append_path(id.to_s)
-          .append_query(turbo_frame: turbo_frame)
+          .append_query(query_params)
           .to_s
       end
 
@@ -100,6 +100,13 @@ module Avo
         use_resource&.name || super
       end
 
+      def query_params
+        {
+          turbo_frame: turbo_frame,
+          view: view
+        }
+      end
+
       private
 
       def frame_id

data/lib/avo/fields/has_one_field.rb

@@ -20,7 +20,7 @@ module Avo
       def frame_url
         Avo::Services::URIService.parse(field_resource.record_path)
           .append_paths(id, value.id)
-          .append_query(turbo_frame: turbo_frame)
+          .append_query(query_params)
           .to_s
       end
 

data/lib/avo/services/encryption_service.rb

@@ -1,32 +1,28 @@
 module Avo
   module Services
     class EncryptionService
-      attr_reader :message
-      attr_reader :purpose
-      attr_reader :crypt
-
       class << self
-        def encrypt(message:, purpose:)
-          new(message: message, purpose: purpose).encrypt
+        def encrypt(...)
+          new(...).encrypt
         end
 
-        def decrypt(message:, purpose:)
-          new(message: message, purpose: purpose).decrypt
+        def decrypt(...)
+          new(...).decrypt
         end
       end
 
-      def initialize(message:, purpose:)
+      def initialize(message:, purpose:, **kwargs)
         @message = message
         @purpose = purpose
-        @crypt = ActiveSupport::MessageEncryptor.new(encryption_key)
+        @crypt = ActiveSupport::MessageEncryptor.new(encryption_key, **kwargs)
       end
 
       def encrypt
-        crypt.encrypt_and_sign(message, purpose: purpose)
+        @crypt.encrypt_and_sign(@message, purpose: @purpose)
       end
 
       def decrypt
-        crypt.decrypt_and_verify(message, purpose: purpose)
+        @crypt.decrypt_and_verify(@message, purpose: @purpose)
       end
 
       private

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "3.0.1.beta19" unless const_defined?(:VERSION)
+  VERSION = "3.0.1.beta20" unless const_defined?(:VERSION)
 end

data/lib/avo/view_inquirer.rb

@@ -2,14 +2,11 @@
 # It also allows to check if the view is a form or a display view by using `view.form?` or `view.display?`
 module Avo
   class ViewInquirer < ActiveSupport::StringInquirer
-    DISPLAY_VIEWS = %w[index show]
-    FORM_VIEWS = %w[new edit]
-
     def initialize(view)
       super(view.to_s)
 
-      @display = in? DISPLAY_VIEWS
-      @form = in? FORM_VIEWS
+      @display = in? %w[index show]
+      @form = in? %w[new edit]
     end
 
     def display?

data/lib/avo.rb

@@ -64,7 +64,7 @@ module Avo
       Avo.run_load_hooks(:init, self)
     end
 
-    # Renerate a dynamic root path using the URIService
+    # Generate a dynamic root path using the URIService
     def root_path(paths: [], query: {}, **args)
       Avo::Services::URIService.parse(Avo::Current.view_context.avo.root_url.to_s)
         .append_paths(paths)