avo 2.17.1.pre.1.zeitwerk.eager.load.dir → 2.17.1.pre.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ce480a1789187841a9bcca025afdb3cfab7f153ba672409d23e7f8cefdfbfa3
-  data.tar.gz: 5737e02acb4959d6a5313dc9534ebb7a6903efeba06b1b923a9902ceaf64c2ee
+  metadata.gz: e373d0b7b292a05ed70462e7a20e78a2f7c559a94f7aca774cd68165e18d2c70
+  data.tar.gz: 545d0fb57feac7577871bceeb107eec82a22d3f8ea0fe50370e93083b4fa4667
 SHA512:
-  metadata.gz: 2c6dd37752b3279c05f68bd1c78751303b517339ecd06c93d35b33d1384527556e046a5680bff507f48a37f8d7a737e9687692d88623e39631d33cbe1266765f
-  data.tar.gz: b29f21327fb24141d7acb656f031decf4320e19944eb7e47d47d5d9fd6bf72148af7a46cc2ec7e0042717940b64d748ad176b0eab2e8f13145020338751c51dc
+  metadata.gz: 7854ba8a53232541ed1ae751099ccf40a339bc25ab85f6cd2e3fa28b7d958f7e480e4d53acea0110acd7167e710e3fdfef91104d567a796b832360c2ce699a46
+  data.tar.gz: d00ec57468d98d63e4e594d93e1eb3bce3bc4734eb65951805124511d2e45eabab646b4b9f16e6d0f458c76732e7cf64d00bfa828154ea92173483bcad174afe

data/Gemfile

@@ -114,7 +114,7 @@ end
 gem "rubocop"
 gem "rubocop-shopify", require: false
 
-# gem "zeitwerk", "~> 2.3"
+gem "zeitwerk", "~> 2.3"
 
 gem "httparty"
 
@@ -153,4 +153,3 @@ gem 'acts-as-taggable-on', '~> 9.0'
 gem "bundler-integrity", "~> 1.0"
 
 gem 'erb-formatter'
-gem "zeitwerk", github: "fxn/zeitwerk"

data/Gemfile.lock

@@ -1,13 +1,7 @@
-GIT
-  remote: https://github.com/fxn/zeitwerk.git
-  revision: 50515063d309bf50cb1fdcffa7558ca26d124b3f
-  specs:
-    zeitwerk (2.6.1)
-
 PATH
   remote: .
   specs:
-    avo (2.17.1.pre.1.zeitwerk.eager.load.dir)
+    avo (2.17.1.pre.3)
       active_link_to
       addressable
       breadcrumbs_on_rails
@@ -24,6 +18,7 @@ PATH
       rails (>= 6.0)
       turbo-rails
       view_component
+      zeitwerk
 
 GEM
   remote: https://rubygems.org/
@@ -270,11 +265,9 @@ GEM
       net-protocol
       timeout
     nio4r (2.5.8)
-    nokogiri (1.13.8)
+    nokogiri (1.13.9)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    nokogiri (1.13.8-x86_64-linux)
-      racc (~> 1.4)
     orm_adapter (0.5.0)
     pagy (5.10.1)
       activesupport
@@ -445,6 +438,7 @@ GEM
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
+    zeitwerk (2.6.1)
 
 PLATFORMS
   ruby
@@ -515,7 +509,7 @@ DEPENDENCIES
   web-console (>= 3.3.0)
   webdrivers
   webmock
-  zeitwerk!
+  zeitwerk (~> 2.3)
 
 BUNDLED WITH
    2.3.5

data/app/components/avo/button_component.rb

@@ -88,8 +88,8 @@ class Avo::ButtonComponent < ViewComponent::Base
   end
 
   def output_button
-    if @args[:method].present?
-      button_to @args[:url], **args do
+    if args.dig(:method).present? || args.dig(:data, :turbo_method).present?
+      button_to args[:url], **args do
         full_content
       end
     else

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

@@ -36,15 +36,15 @@
         <% if @resource.authorization.authorize_action(:delete_attachments?, raise_exception: false) %>
           <%= a_link destroy_path,
             icon: 'heroicons/outline/trash',
-            method: :delete,
             color: :red,
             compact: true,
             size: :xs,
             class: 'text-center',
             title: t('avo.delete_file', item: file.filename),
             data: {
-              'turbo-frame': 'destroy_attachment_form',
-              confirm: t('avo.are_you_sure'),
+              turbo_method: :delete,
+              turbo_frame: 'destroy_attachment_form',
+              turbo_confirm: t('avo.are_you_sure'),
               tippy: :tooltip
             } %>
         <% end %>

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

@@ -7,6 +7,8 @@
       date_field_picker_format_value: @field.picker_format,
       date_field_first_day_of_week_value: @field.first_day_of_week,
       date_field_disable_mobile_value: @field.disable_mobile,
+      date_field_field_type_value: "date",
+      date_field_picker_options_value: @field.picker_options,
   } do %>
     <%= datetime_field "fake_#{@field.id}", "fake",
       value: @field.edit_formatted_value,

data/app/components/avo/fields/date_field/index_component.html.erb

@@ -3,6 +3,7 @@
     controller: "date-field",
     date_field_view_value: @view,
     date_field_format_value: @field.format,
+    date_field_field_type_value: "date",
   } do %>
     <%= @field.formatted_value %>
   <% end %>

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

@@ -3,6 +3,7 @@
     controller: "date-field",
     date_field_view_value: @view,
     date_field_format_value: @field.format,
+    date_field_field_type_value: "date",
   } do %>
     <%= @field.formatted_value %>
   <% end %>

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

@@ -8,6 +8,8 @@
       date_field_disable_mobile_value: @field.disable_mobile,
       date_field_time24_hr_value: @field.time_24hr,
       date_field_timezone_value: @field.timezone,
+      date_field_field_type_value: "dateTime",
+      date_field_picker_options_value: @field.picker_options,
   } do %>
     <%= datetime_field "fake_#{@field.id}", "fake",
       value: @field.edit_formatted_value,

data/app/components/avo/fields/date_time_field/index_component.html.erb

@@ -6,6 +6,7 @@
     date_field_format_value: @field.format,
     date_field_timezone_value: @field.timezone,
     date_field_picker_format_value: @field.picker_format,
+    date_field_field_type_value: "dateTime",
   } do %>
     <%= @field.formatted_value %>
   <% end %>

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

@@ -6,6 +6,7 @@
     date_field_format_value: @field.format,
     date_field_timezone_value: @field.timezone,
     date_field_picker_format_value: @field.picker_format,
+    date_field_field_type_value: "dateTime",
   } do %>
     <%= @field.formatted_value %>
   <% end %>

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

@@ -0,0 +1,40 @@
+<%= field_wrapper **field_wrapper_args do %>
+  <%= content_tag :div, data: {
+      controller: "date-field",
+      date_field_view_value: @view,
+      date_field_enable_time_value: true,
+      date_field_picker_format_value: @field.picker_format,
+      date_field_disable_mobile_value: @field.disable_mobile,
+      date_field_time24_hr_value: @field.time_24hr,
+      date_field_no_calendar_value: true,
+      date_field_timezone_value: @field.timezone,
+      date_field_relative_value: @field.relative,
+      date_field_field_type_value: "time",
+      date_field_picker_options_value: @field.picker_options,
+  } do %>
+    <%= datetime_field "fake_#{@field.id}", "fake",
+      value: @field.edit_formatted_value,
+      class: classes("w-full"),
+      data: {
+        'date-field-target': 'fakeInput',
+        placeholder: @field.placeholder,
+        **@field.get_html(:data, view: view, element: :input)
+      },
+      disabled: @field.is_readonly?,
+      placeholder: @field.placeholder,
+      style: @field.get_html(:style, view: view, element: :input)
+    %>
+    <%= @form.text_field @field.id,
+      value: @field.edit_formatted_value,
+      class: classes("w-full hidden"),
+      data: {
+        'date-field-target': 'input',
+        placeholder: @field.placeholder,
+        **@field.get_html(:data, view: view, element: :input)
+      },
+      disabled: @field.is_readonly?,
+      placeholder: @field.placeholder,
+      style: @field.get_html(:style, view: view, element: :input)
+    %>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class Avo::Fields::TimeField::EditComponent < Avo::Fields::EditComponent
+end

data/app/components/avo/fields/time_field/index_component.html.erb

@@ -0,0 +1,15 @@
+<%= index_field_wrapper **field_wrapper_args do %>
+   <%= content_tag :div, data: {
+    controller: "date-field",
+    date_field_view_value: @view,
+    date_field_enable_time_value: true,
+    date_field_format_value: @field.format,
+    date_field_timezone_value: @field.timezone,
+    date_field_picker_format_value: @field.picker_format,
+    date_field_no_calendar_value: true,
+    date_field_relative_value: @field.relative,
+    date_field_field_type_value: "time",
+  } do %>
+    <%= @field.formatted_value %>
+  <% end %>
+<% end %>

data/app/components/avo/fields/time_field/index_component.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class Avo::Fields::TimeField::IndexComponent < Avo::Fields::IndexComponent
+end

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

@@ -0,0 +1,15 @@
+<%= field_wrapper **field_wrapper_args do %>
+  <%= content_tag :div, data: {
+    controller: "date-field",
+    date_field_view_value: @view,
+    date_field_enable_time_value: true,
+    date_field_format_value: @field.format,
+    date_field_timezone_value: @field.timezone,
+    date_field_picker_format_value: @field.picker_format,
+    date_field_no_calendar_value: true,
+    date_field_relative_value: @field.relative,
+    date_field_field_type_value: "time",
+  } do %>
+    <%= @field.formatted_value %>
+  <% end %>
+<% end %>

data/app/components/avo/fields/time_field/show_component.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class Avo::Fields::TimeField::ShowComponent < Avo::Fields::ShowComponent
+end

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

@@ -42,7 +42,7 @@
         type: :submit,
         data: {
           target: 'control:detach',
-          confirm: t('avo.are_you_sure_detach_item', item: singular_resource_name),
+          turbo_confirm: t('avo.are_you_sure_detach_item', item: singular_resource_name),
           control: :detach,
           'resource-id': @resource.model.id,
           'tippy': 'tooltip',
@@ -66,7 +66,7 @@
         type: :submit,
         data: {
           target: 'control:destroy',
-          confirm: t('avo.are_you_sure',  item: singular_resource_name),
+          turbo_confirm: t('avo.are_you_sure',  item: singular_resource_name),
           control: :destroy,
           'resource-id': @resource.model.id,
           'tippy': 'tooltip',

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

@@ -37,8 +37,11 @@
         <%# Example link below %>
         <%#= render Avo::ProfileItemComponent.new label: 'Profile', path: '/profile', icon: 'user-circle' %>
         <%= button_to helpers.main_app.send(destroy_user_session_path),
-          method: :delete,
           form: { "data-turbo" => "false" },
+          method: :delete,
+          data: {
+            confirm: t('avo.are_you_sure')
+          },
           class: "flex-1 flex items-center justify-center bg-white text-left cursor-pointer text-red-600 font-semibold hover:bg-red-100 block px-4 py-1 w-full py-3 text-center rounded w-full",
           form_class: 'flex-1' do %>
           <%= helpers.svg 'logout', class: 'h-4 mr-1' %> <%= t('avo.sign_out') %>

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

@@ -25,18 +25,16 @@
           <% end %>
           <% if can_see_the_destroy_button? %>
             <%= a_link destroy_path,
-            method: :delete,
-            local: true,
-            style: :text,
-            loading: true,
-            confirm: t('avo.are_you_sure', item: @resource.model.model_name.name.downcase),
-            color: :red,
-            icon: 'trash',
-            form_class: 'flex flex-col sm:flex-row sm:inline-flex',
-            data: {
-              control: :destroy,
-              'resource-id': @resource.model.id,
-            } do %>
+              style: :text,
+              color: :red,
+              icon: 'trash',
+              form_class: 'flex flex-col sm:flex-row sm:inline-flex',
+              data: {
+                turbo_confirm: t('avo.are_you_sure', item: @resource.model.model_name.name.downcase),
+                turbo_method: :delete,
+                control: :destroy,
+                'resource-id': @resource.model.id,
+              } do %>
               <%= t('avo.delete').capitalize %>
             <% end %>
           <% end %>

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

@@ -21,17 +21,15 @@
             <% end %>
           <% elsif control.delete_button? %>
             <% if can_see_the_destroy_button? %>
-              <%= a_button url: helpers.resource_path(model: @resource.model, resource: @resource),
-                method: :delete,
-                local: true,
+              <%= a_link helpers.resource_path(model: @resource.model, resource: @resource),
                 style: :text,
-                loading: true,
-                confirm: t('avo.are_you_sure', item: @resource.model.model_name.name.downcase),
                 color: :red,
                 icon: 'trash',
                 form_class: 'flex flex-col sm:flex-row sm:inline-flex',
                 title: control.title,
                 data: {
+                  turbo_confirm: t('avo.are_you_sure', item: @resource.model.model_name.name.downcase),
+                  turbo_method: :delete,
                   control: :destroy,
                   tippy: control.title ? :tooltip : nil,
                   'resource-id': @resource.model.id,
@@ -84,13 +82,13 @@
           <% elsif control.detach_button? %>
             <% if @reflection.present? && @resource.model.present? && can_detach? %>
               <%= a_button url: detach_path,
-                  icon: 'detach',
-                  method: :delete,
-                  form_class: 'flex flex-col sm:flex-row sm:inline-flex',
-                  style: :text,
-                  data: {
-                    confirm: "Are you sure you want to detach this #{title}."
-                  } do %>
+                icon: 'detach',
+                method: :delete,
+                form_class: 'flex flex-col sm:flex-row sm:inline-flex',
+                style: :text,
+                data: {
+                  confirm: "Are you sure you want to detach this #{title}."
+                } do %>
                 <%= control.label %>
               <% end %>
             <% end %>
@@ -126,19 +124,17 @@
             <%= t('avo.go_back') %>
           <% end %>
           <% if can_see_the_destroy_button? %>
-            <%= a_button url: destroy_path,
-                method: :delete,
-                local: true,
-                style: :text,
-                loading: true,
-                confirm: t('avo.are_you_sure', item: @resource.model.model_name.name.downcase),
-                color: :red,
-                icon: 'trash',
-                form_class: 'flex flex-col sm:flex-row sm:inline-flex',
-                data: {
-                  control: :destroy,
-                  'resource-id': @resource.model.id,
-                } do %>
+            <%= a_link destroy_path,
+              style: :text,
+              color: :red,
+              icon: 'trash',
+              form_class: 'flex flex-col sm:flex-row sm:inline-flex',
+              data: {
+                turbo_confirm: t('avo.are_you_sure', item: @resource.model.model_name.name.downcase),
+                turbo_method: :delete,
+                control: :destroy,
+                'resource-id': @resource.model.id,
+              } do %>
               <%= t('avo.delete').capitalize %>
             <% end %>
           <% end %>

data/app/controllers/avo/associations_controller.rb

@@ -158,11 +158,8 @@ module Avo
 
     def set_related_authorization
       @authorization = if related_resource
-        t = related_resource.authorization(user: _current_user)
-        puts ["1->", t, related_resource].inspect
-        t
+        related_resource.authorization(user: _current_user)
       else
-        puts ["2->"].inspect
         Services::AuthorizationService.new _current_user
       end
     end

data/app/javascript/js/controllers/fields/date_field_controller.js

@@ -7,6 +7,9 @@ function universalTimestamp(timestampStr) {
   return new Date(new Date(timestampStr).getTime() + (new Date(timestampStr).getTimezoneOffset() * 60 * 1000))
 }
 
+const RAW_DATE_FORMAT = 'y/LL/dd'
+const RAW_TIME_FORMAT = 'TT'
+
 export default class extends Controller {
   static targets = ['input', 'fakeInput']
 
@@ -19,6 +22,10 @@ export default class extends Controller {
     firstDayOfWeek: Number,
     time24Hr: Boolean,
     disableMobile: Boolean,
+    noCalendar: Boolean,
+    relative: Boolean,
+    fieldType: { type: String, default: 'dateTime' },
+    pickerOptions: { type: Object, default: {} },
   }
 
   flatpickrInstance;
@@ -90,8 +97,8 @@ export default class extends Controller {
   initShow() {
     let value = this.parsedValue
 
-    // Set the zone only if the type of field is date time.
-    if (this.enableTimeValue) {
+    // Set the zone only if the type of field is date time or relative time.
+    if (this.enableTimeValue && this.relativeValue) {
       value = value.setZone(this.displayTimezone)
     }
 
@@ -109,6 +116,8 @@ export default class extends Controller {
       },
       altInput: true,
       onChange: this.onChange.bind(this),
+      noCalendar: false,
+      ...this.pickerOptionsValue,
     }
 
     // Set the format of the displayed input field.
@@ -124,24 +133,45 @@ export default class extends Controller {
     options.enableTime = this.enableTimeValue
     options.enableSeconds = this.enableTimeValue
 
-    // enable timezone display
-    if (this.enableTimeValue) {
-      options.defaultDate = this.parsedValue.setZone(this.displayTimezone).toISO()
+    // Hide calendar and only keep time picker.
+    options.noCalendar = this.noCalendarValue
 
-      options.dateFormat = 'Y-m-d H:i:S'
-    } else {
-      // Because the browser treats the date like a timestamp and updates it at 00:00 hour, when on a western timezone the date will be converted with one day offset.
-      // Ex: 2022-01-30 will render as 2022-01-29 on an American timezone
-      options.defaultDate = universalTimestamp(this.initialValue)
+    if (this.initialValue) {
+      // Enable timezone display
+      if (this.enableTimeValue && this.relativeValue) {
+        options.defaultDate = this.parsedValue.setZone(this.displayTimezone).toISO()
+
+        options.dateFormat = 'Y-m-d H:i:S'
+      } else {
+        // Because the browser treats the date like a timestamp and updates it at 00:00 hour, when on a western timezone the date will be converted with one day offset.
+        // Ex: 2022-01-30 will render as 2022-01-29 on an American timezone
+        options.defaultDate = universalTimestamp(this.initialValue)
+      }
     }
 
     this.flatpickrInstance = flatpickr(this.fakeInputTarget, options)
 
-    if (this.enableTimeValue) {
-      this.updateRealInput(this.parsedValue.setZone(this.displayTimezone).toISO())
-    } else {
-      this.updateRealInput(universalTimestamp(this.initialValue))
+    // Don't try to parse the value if the input is empty.
+    if (!this.initialValue) {
+      return
     }
+
+    let value
+    switch (this.fieldTypeValue) {
+      case 'time':
+        // For time values, we should maintain the real value and format it to a time-friendly format.
+        value = this.parsedValue.setZone(this.displayTimezone, { keepLocalTime: true }).toFormat(RAW_TIME_FORMAT)
+        break
+      case 'date':
+        value = DateTime.fromJSDate(universalTimestamp(this.initialValue)).toFormat(RAW_DATE_FORMAT)
+        break
+      default:
+      case 'dateTime':
+        value = this.parsedValue.setZone(this.displayTimezone).toISO()
+        break
+    }
+
+    this.updateRealInput(value)
   }
 
   onChange(selectedDates) {
@@ -152,24 +182,34 @@ export default class extends Controller {
       return
     }
 
-    let time
     let args = {}
 
-    if (this.timezoneValue) {
+    // For values that involve time we should keep the local time.
+    if (this.timezoneValue || !this.relativeValue) {
       args = { keepLocalTime: true }
     } else {
       args = { keepLocalTime: false }
     }
 
-    if (this.enableTimeValue) {
-      time = DateTime.fromISO(selectedDates[0].toISOString()).setZone('UTC', args)
-    } else {
-      time = DateTime.fromISO(selectedDates[0].toISOString()).setZone('UTC', { keepLocalTime: true })
+    let value
+    switch (this.fieldTypeValue) {
+      case 'time':
+        // For time values, we should maintain the real value and format it to a time-friendly format.
+        value = DateTime.fromISO(selectedDates[0].toISOString()).setZone('UTC', args).toFormat(RAW_TIME_FORMAT)
+        break
+      case 'date':
+        value = DateTime.fromISO(selectedDates[0].toISOString()).setZone('UTC', { keepLocalTime: true }).toFormat(RAW_DATE_FORMAT)
+        break
+      default:
+      case 'dateTime':
+        value = DateTime.fromISO(selectedDates[0].toISOString()).setZone('UTC', args).toISO()
+        break
     }
 
-    this.updateRealInput(time)
+    this.updateRealInput(value)
   }
 
+  // Value should be a string
   updateRealInput(value) {
     this.inputTarget.value = value
   }

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

@@ -73,6 +73,9 @@ export default class extends Controller {
       Mousetrap.bind(['command+k', 'ctrl+k'], () => this.showSearchPanel())
     }
 
+    // This line fixes a bug where the search box would be duplicated on back navigation.
+    this.autocompleteTarget.innerHTML = ''
+
     autocomplete({
       container: this.autocompleteTarget,
       placeholder: this.translationKeys.placeholder,

data/avo.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "rails", ">= 6.0"
   spec.add_dependency "pagy"
-  # spec.add_dependency "zeitwerk", git: "https://github.com/fxn/zeitwerk"
+  spec.add_dependency "zeitwerk"
   spec.add_dependency "countries"
   spec.add_dependency "pundit"
   spec.add_dependency "httparty"

data/config/routes.rb

@@ -33,7 +33,7 @@ Avo::Engine.routes.draw do
 
     # Generate resource routes as below:
     # resources :posts
-    Avo::DynamicRouter.routes
+    Avo::DynamicRouter.routes(self)
 
     # Associations
     get "/:resource_name/:id/:related_name/new", to: "associations#new", as: "associations_new"

data/db/factories.rb

@@ -69,6 +69,7 @@ FactoryBot.define do
     skills { [Faker::Educator.subject, Faker::Educator.subject, Faker::Educator.subject, Faker::Educator.subject, Faker::Educator.subject] }
     country { Course.countries.sample }
     city { Course.cities.stringify_keys[country].sample }
+    starting_at { Time.now }
   end
 
   factory :course_link, class: "Course::Link" do

data/lib/avo/app.rb

@@ -17,12 +17,6 @@ module Avo
     class_attribute :error_messages
 
     class << self
-      def eager_load_resources
-        Rails.autoloaders.each do |loader|
-          loader.eager_load_dir(Rails.root.join("app", "avo", "resources").to_s)
-        end
-      end
-
       def boot
         init_fields
 

data/lib/avo/concerns/handles_field_args.rb

@@ -28,6 +28,10 @@ module Avo
         add_prop_from_args args, name: name, default: default, type: :array
       end
 
+      def add_object_prop(args, name, default = {})
+        add_prop_from_args args, name: name, default: default, type: :object
+      end
+
       def add_string_prop(args, name, default = nil)
         add_prop_from_args args, name: name, default: default, type: :string
       end