avo 2.11.2.pre.3 → 2.11.3.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d9e1f29fde441425a8bb70c8d3afc6f8acece76e6ac2a2dc2abc953567c6053
-  data.tar.gz: 8f9a42b1f4084a1846f8b1a279dd15119323cacad40054709677ac980cb7387d
+  metadata.gz: 6322eef586c1cf132343d666fa513b2733699349d2945a86ddb2b37669cfcd1c
+  data.tar.gz: 5fb654449921d9fde5312adbeee074f96752445c34416ea4a6a22e6c5f9be9df
 SHA512:
-  metadata.gz: 07e9b92e4bfa7031cb8ef415c64d886f10c4e83c7b2974485f9f891f99d56bf1176ae3d576c7e2f68a4a8b202f829ca53e0978d06b2fbf0620deef581567c79c
-  data.tar.gz: 7700c610f99c0509b513a3180d420f28c82c403dfd4456867eb74e53178ac287d8c4d28a0c64c501b9923c0dbdc057d9940988fb222008024e836aabfb4c96ae
+  metadata.gz: 8c9ee8afe73d49806a42032b5c3f2b8c49a05763d44048e44c55ab4831d30c475ad2792cb6ad11ce5bd8ce296202c20173dd8bf274b05c64f6ac60174835953b
+  data.tar.gz: f22c15ebaaee96768cd5c38c2935a513410a32a5e46729b22c4c8375c1b7a229b4e3e733572f3fe47207229bae4775ce3a5510c528a532759c81b8b2b0b39fc7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.11.2.pre.3)
+    avo (2.11.3.pre.1)
       active_link_to
       addressable
       breadcrumbs_on_rails

data/app/assets/stylesheets/avo.css

@@ -16,6 +16,7 @@
 @import './css/breadcrumbs.css';
 @import './css/search.css';
 @import './css/active-storage.css';
+@import './css/scrollbar.css';
 @import './css/sidebar.css';
 @import './css/spinner.css';
 @import './css/tags.css';

data/app/assets/stylesheets/css/scrollbar.css

@@ -0,0 +1,30 @@
+/* total width */
+body.os-pc .mac-styled-scrollbar::-webkit-scrollbar {
+    background-color: none;
+    width: 0.5rem;
+    height: 0.5rem;
+}
+
+/* background of the scrollbar except button or resizer */
+body.os-pc .mac-styled-scrollbar::-webkit-scrollbar-track {
+    background-color: none;
+}
+
+/* scrollbar itself */
+body.os-pc .mac-styled-scrollbar::-webkit-scrollbar-thumb {
+    background-color: #babac0;
+    border-radius: 0.5rem;
+}
+
+/* set button(top and bottom of the scrollbar) */
+body.os-pc .mac-styled-scrollbar::-webkit-scrollbar-button {
+    display:none;
+}
+/* hide by default */
+body.os-pc .mac-styled-scrollbar::-webkit-scrollbar-thumb {
+  display:none
+}
+/* show on hover */
+body.os-pc .mac-styled-scrollbar:hover::-webkit-scrollbar-thumb {
+  display:block
+}

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

@@ -3,9 +3,9 @@
   data-actions-picker-enabled-class="text-black hover:bg-blue-500 hover:text-white"
   data-actions-picker-disabled-class="cursor-wait text-gray-500"
 >
-  <%= a_button style: :outline,
+  <%= a_button style: @style,
     type: :button,
-    color: :primary,
+    color: @color,
     class: "focus:outline-none",
     icon: 'arrow-circle-right',
     icon_class: 'transform rotate-90',
@@ -18,7 +18,7 @@
     data-toggle-panel-target="panel"
   >
     <div class="w-full space divide-y">
-      <% @actions.each_with_index do |action, index| %>
+      <% actions.each_with_index do |action, index| %>
         <%= link_to action_path(action.param_id),
           data: {
             'turbo-frame': 'actions_show',

data/app/components/avo/actions_component.rb

@@ -3,14 +3,23 @@
 class Avo::ActionsComponent < ViewComponent::Base
   include Avo::ApplicationHelper
 
-  def initialize(actions: [], resource: nil, view: nil)
-    @actions = actions
+  def initialize(actions: [], resource: nil, view: nil, exclude: [], style: :outline, color: :blue)
+    @actions = actions || []
     @resource = resource
     @view = view
+    @exclude = exclude
+    @color = color
+    @style = style
   end
 
   def render?
-    @actions.present?
+    actions.present?
+  end
+
+  def actions
+    @actions.select do |action|
+      !action.class.in?(@exclude)
+    end
   end
 
   # When running an action for one record we should do it on a special path.

data/app/components/avo/button_component.rb

@@ -43,9 +43,7 @@ class Avo::ButtonComponent < ViewComponent::Base
     classes = "button-component inline-flex flex-grow-0 items-center font-semibold leading-6 fill-current whitespace-nowrap transition duration-100 transform transition duration-100 cursor-pointer disabled:cursor-not-allowed disabled:opacity-70 border justify-center active:outline active:outline-1 #{@class}"
 
     classes += " rounded" if @rounded.present?
-
     classes += style_classes
-
     classes += horizontal_padding_classes
     classes += vertical_padding_classes
     classes += text_size_classes
@@ -151,7 +149,7 @@ class Avo::ButtonComponent < ViewComponent::Base
   def style_classes
     case @style
     when :primary
-      " bg-primary-500 text-white border-primary-500 hover:bg-primary-600 hover:border-primary-600 active:border-primary-700 active:outline-primary-700 active:bg-primary-600"
+      " bg-#{@color}-500 text-white border-#{@color}-500 hover:bg-#{@color}-600 hover:border-#{@color}-600 active:border-#{@color}-700 active:outline-#{@color}-700 active:bg-#{@color}-600"
     when :outline
       " bg-white text-#{@color}-500 border-#{@color}-500 hover:bg-#{@color}-100 active:bg-#{@color}-100 active:border-#{@color}-500 active:outline-#{@color}-500"
     when :text

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

@@ -7,43 +7,45 @@
 
   per_page_options = per_page_options.sort.uniq
 %>
-<div class="flex flex-col sm:flex-row items-center justify-between aborder-t aborder-slate-200 rounded-xl space-y-2 sm:space-y-0">
-  <div class="flex-2 sm:flex sm:items-center sm:justify-between">
-    <div>
-      <div class="text-sm leading-5 text-slate-600 flex items-center">
-        <div data-controller="per-page">
-          <div class="flex items-center">
-            <%= select_tag 'per_page',
-              options_for_select(per_page_options, index_params[:per_page]),
-              class: 'appearance-none inline-flex bg-white-100 disabled:bg-white-400 disabled:cursor-not-allowed focus:bg-white text-slate-700 disabled:text-slate-600 rounded-md py-1 px-2 leading-tight border border-slate-300 outline-none focus:border-slate-400 outline w-16 mr-1 text-sm',
-              data: {
-                'turbo-frame': turbo_frame,
-                'per-page-target': 'selector',
-                action: 'change->per-page#reload'
-              }
-            %> <%= t('avo.per_page').downcase %>
-          </div>
-          <% per_page_options.each do |option| %>
-            <% if parent_model.present? %>
-              <%= link_to "Change to #{option} items per page", helpers.related_resources_path(parent_model, parent_model, per_page: option, keep_query_params: true, page: 1), class: 'hidden', 'data-per-page-option': option, 'data-turbo-frame': turbo_frame %>
-            <% else %>
-              <%= link_to "Change to #{option} items per page", helpers.resources_path(resource: resource, per_page: option, keep_query_params: true, page: 1), class: 'hidden', 'data-per-page-option': option, 'data-turbo-frame': turbo_frame %>
+<% unless @pagy.pages <= 1 && discreet_pagination %>
+  <div class="flex flex-col sm:flex-row items-center justify-between aborder-t aborder-slate-200 rounded-xl space-y-2 sm:space-y-0">
+    <div class="flex-2 sm:flex sm:items-center sm:justify-between">
+      <div>
+        <div class="text-sm leading-5 text-slate-600 flex items-center">
+          <div data-controller="per-page">
+            <div class="flex items-center">
+              <%= select_tag 'per_page',
+                options_for_select(per_page_options, index_params[:per_page]),
+                class: 'appearance-none inline-flex bg-white-100 disabled:bg-white-400 disabled:cursor-not-allowed focus:bg-white text-slate-700 disabled:text-slate-600 rounded-md py-1 px-2 leading-tight border border-slate-300 outline-none focus:border-slate-400 outline w-16 mr-1 text-sm',
+                data: {
+                  'turbo-frame': turbo_frame,
+                  'per-page-target': 'selector',
+                  action: 'change->per-page#reload'
+                }
+              %> <%= t('avo.per_page').downcase %>
+            </div>
+            <% per_page_options.each do |option| %>
+              <% if parent_model.present? %>
+                <%= link_to "Change to #{option} items per page", helpers.related_resources_path(parent_model, parent_model, per_page: option, keep_query_params: true, page: 1), class: 'hidden', 'data-per-page-option': option, 'data-turbo-frame': turbo_frame %>
+              <% else %>
+                <%= link_to "Change to #{option} items per page", helpers.resources_path(resource: resource, per_page: option, keep_query_params: true, page: 1), class: 'hidden', 'data-per-page-option': option, 'data-turbo-frame': turbo_frame %>
+              <% end %>
             <% end %>
-          <% end %>
+          </div>
         </div>
       </div>
     </div>
-  </div>
-  <div class="flex">
-    <div class="flex-2 sm:flex sm:items-center sm:justify-between space-y-2 sm:space-y-0 text-center sm:text-left">
-      <% if @pagy.count > 0 %>
-        <div class="text-sm text-slate-600 mr-4"><%== helpers.pagy_info @pagy %></div>
-      <% end %>
+    <div class="flex">
+      <div class="flex-2 sm:flex sm:items-center sm:justify-between space-y-2 sm:space-y-0 text-center sm:text-left">
+        <% if @pagy.count > 0 %>
+          <div class="text-sm text-slate-600 mr-4"><%== helpers.pagy_info @pagy %></div>
+        <% end %>
 
-      <% if @pagy.pages > 1 %>
-        <%# @todo: add first & last page. make the first and last buttons rounded %>
-        <%== helpers.pagy_nav @pagy %>
-      <% end %>
+        <% if @pagy.pages > 1 %>
+          <%# @todo: add first & last page. make the first and last buttons rounded %>
+          <%== helpers.pagy_nav @pagy %>
+        <% end %>
+      </div>
     </div>
   </div>
-</div>
+<% end %>

data/app/components/avo/paginator_component.rb

@@ -6,12 +6,14 @@ class Avo::PaginatorComponent < ViewComponent::Base
   attr_reader :index_params
   attr_reader :resource
   attr_reader :parent_model
+  attr_reader :discreet_pagination
 
-  def initialize(resource: nil, parent_model: nil, pagy: nil, turbo_frame: nil, index_params: nil)
+  def initialize(resource: nil, parent_model: nil, pagy: nil, turbo_frame: nil, index_params: nil, discreet_pagination: nil)
     @pagy = pagy
     @turbo_frame = turbo_frame
     @index_params = index_params
     @resource = resource
     @parent_model = parent_model
+    @discreet_pagination = discreet_pagination
   end
 end

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

@@ -17,7 +17,7 @@
         <% end %>
       </div>
       <% if tools.present? %>
-        <div class="flex-1 w-full flex flex-col sm:flex-row xl:justify-end sm:items-end space-y-2 sm:space-y-0 sm:space-x-2 mt-4 xl:mt-0">
+        <div class="flex-1 w-full flex flex-wrap flex-col sm:flex-row xl:justify-end sm:items-end gap-2 mt-4 xl:mt-0" data-target="panel-controls">
           <%= tools %>
         </div>
       <% end %>

data/app/components/avo/resource_component.rb

@@ -22,6 +22,12 @@ class Avo::ResourceComponent < Avo::BaseComponent
     authorize_association_for("detach")
   end
 
+  def detach_path
+    return "/" if @reflection.blank?
+
+    helpers.resource_detach_path(params[:resource_name], params[:id], @reflection.name.to_s, @resource.model.id)
+  end
+
   def can_see_the_edit_button?
     @resource.authorization.authorize_action(:edit, raise_exception: false)
   end
@@ -30,10 +36,6 @@ class Avo::ResourceComponent < Avo::BaseComponent
     @resource.authorization.authorize_action(:destroy, raise_exception: false)
   end
 
-  def detach_path
-    helpers.resource_detach_path(params[:resource_name], params[:id], @reflection.name.to_s, @resource.model.id)
-  end
-
   def destroy_path
     helpers.resource_path(model: @resource.model, resource: @resource)
   end

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

@@ -9,7 +9,7 @@
   data-transition-leave-end="transform opacity-0 -translate-x-full"
 >
   <div class="flex flex-col w-full h-full">
-    <div class="flex-1 flex flex-col justify-between overflow-auto h-full pt-3 scroll-shadows">
+    <div class="flex-1 flex flex-col justify-between overflow-auto h-full pt-3 scroll-shadows mac-styled-scrollbar">
       <div class="space-y-6 mb-4">
         <%= render Avo::Sidebar::LinkComponent.new label: 'Get started', path: helpers.avo.root_path, active: :exclusive if Rails.env.development? && Avo.configuration.home_path.nil? %>
 

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

@@ -1,4 +1,4 @@
-<div class="flex" data-target="tab-switcher">
+<div class="flex overflow-auto mac-styled-scrollbar" data-target="tab-switcher">
   <div class="button-group">
     <% visible_items.each do |tab| %>
       <%= a_link tab_path(tab),

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

@@ -49,7 +49,7 @@
       </div>
       <% if view_type.to_sym == :table %>
         <% if @resources.present? %>
-          <div class="w-full overflow-auto flex flex-col mt-0">
+          <div class="w-full overflow-auto flex flex-col mt-0 mac-styled-scrollbar">
             <div class="relative flex-1 flex">
               <%= render(Avo::Index::ResourceTableComponent.new(resources: @resources, resource: @resource, reflection: @reflection, parent_model: @parent_model, parent_resource: @parent_resource)) %>
             </div>
@@ -63,14 +63,14 @@
       <% if view_type.to_sym == :table %>
         <% if @models.present? %>
           <div class="mt-4">
-            <%= render Avo::PaginatorComponent.new pagy: @pagy, turbo_frame: @turbo_frame || 'none', index_params: @index_params, resource: @resource, parent_model: @parent_model %>
+            <%= render Avo::PaginatorComponent.new pagy: @pagy, turbo_frame: @turbo_frame || 'none', index_params: @index_params, resource: @resource, parent_model: @parent_model, discreet_pagination: field&.discreet_pagination %>
           </div>
         <% end %>
       <% end %>
       <% if view_type.to_sym == :grid %>
         <%= render Avo::Index::ResourceGridComponent.new(resources: @resources, resource: @resource, reflection: @reflection, parent_model: @parent_model) %>
         <div class="mt-6">
-          <%= render Avo::PaginatorComponent.new pagy: @pagy, turbo_frame: @turbo_frame || 'none', index_params: @index_params, resource: @resource, parent_model: @parent_model %>
+          <%= render Avo::PaginatorComponent.new pagy: @pagy, turbo_frame: @turbo_frame || 'none', index_params: @index_params, resource: @resource, parent_model: @parent_model, discreet_pagination: field&.discreet_pagination %>
         </div>
       <% end %>
     <% end %>

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

@@ -7,59 +7,148 @@
   } do %>
   <%= render Avo::PanelComponent.new(title: title, description: @resource.resource_description, display_breadcrumbs: @reflection.blank?, index: 0, data: { panel_id: "main" }) do |c| %>
     <% c.tools do %>
-      <% if @reflection.present? && @resource.model.present? %>
-        <% if 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 %>
-            <%= t('avo.detach_item', item: title).capitalize %>
-          <% end %>
-        <% end %>
-        <%= render Avo::ActionsComponent.new actions: @actions, resource: @resource, view: @view %>
-        <% if can_see_the_edit_button? %>
-          <%= a_link edit_path,
-            color: :primary,
-            style: :primary,
-            icon: 'edit' do %>
-            <%= t('avo.edit').capitalize %>
+      <% if @resource.has_show_controls? %>
+        <% @resource.render_show_controls.each do |control| %>
+          <% if control.back_button? %>
+            <%= a_link back_path,
+                style: :text,
+                title: control.title,
+                data: {
+                  tippy: control.title ? :tooltip : nil,
+                },
+                icon: 'arrow-left' do %>
+              <%= control.label %>
+            <% end %>
+          <% elsif control.delete_button? %>
+            <% if can_see_the_destroy_button? %>
+            <% end %>
+            <%= a_button url: helpers.resource_path(model: @resource.model, resource: @resource),
+                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',
+                title: control.title,
+                data: {
+                  control: :destroy,
+                  tippy: control.title ? :tooltip : nil,
+                  'resource-id': @resource.model.id,
+                } do %>
+            <% end %>
+          <% elsif control.actions_list? %>
+            <%= render Avo::ActionsComponent.new actions: @actions, resource: @resource, view: @view, exclude: control.exclude, style: control.style, color: control.color %>
+          <% elsif control.edit_button? %>
+            <% if @resource.authorization.authorize_action(:edit, raise_exception: false) %>
+            <% end %>
+            <%= a_link edit_path,
+                color: :primary,
+                style: :primary,
+                title: control.title,
+                data: {
+                  tippy: control.title ? :tooltip : nil,
+                },
+                icon: 'edit' do %>
+              <%= control.label %>
+            <% end %>
+          <% elsif control.action? %>
+            <%= a_link control.path,
+                color: control.color,
+                style: control.style,
+                icon: control.icon,
+                title: control.title,
+                data: {
+                  tippy: control.title ? :tooltip : nil,
+                  'turbo-frame': 'actions_show',
+                  'action': 'click->actions-picker#visitAction',
+                } do %>
+              <%= control.label %>
+            <% end %>
+          <% elsif control.link_to? %>
+            <%= a_link control.path,
+                color: control.color,
+                style: control.style,
+                icon: control.icon,
+                title: control.title,
+                target: control.target,
+                class: control.class,
+                data: {
+                  **control.data,
+                  tippy: control.title ? :tooltip : nil,
+                } do %>
+              <%= control.label %>
+            <% end %>
+          <% 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 %>
+                <%= t('avo.detach_item', item: title).capitalize %>
+              <% end %>
+            <% end %>
           <% end %>
         <% end %>
       <% else %>
-        <%= a_link back_path,
-          style: :text,
-          icon: 'arrow-left' do %>
-          <%= t('avo.go_back') %>
-        <% end %>
-        <% if can_see_the_destroy_button? %>
-          <%= a_button url: helpers.resource_path(model: @resource.model, resource: @resource),
-            method: :delete,
-            local: true,
+        <% if @reflection.present? && @resource.model.present? %>
+          <% if 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 %>
+              <%= t('avo.detach_item', item: title).capitalize %>
+            <% end %>
+          <% end %>
+          <%= render Avo::ActionsComponent.new actions: @actions, resource: @resource, view: @view %>
+          <% if can_see_the_edit_button? %>
+            <%= a_link edit_path,
+                color: :primary,
+                style: :primary,
+                icon: 'edit' do %>
+              <%= t('avo.edit').capitalize %>
+            <% end %>
+          <% end %>
+        <% else %>
+          <%= a_link back_path,
             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,
-              'tippy': 'tooltip',
-            } do %>
-            <%= t('avo.delete').capitalize %>
+            icon: 'arrow-left' do %>
+            <%= t('avo.go_back') %>
           <% end %>
-        <% end %>
-        <%= 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,
-            style: :primary,
-            icon: 'edit' do %>
-            <%= t('avo.edit').capitalize %>
+          <% if can_see_the_destroy_button? %>
+            <%= a_button url: helpers.resource_path(model: @resource.model, resource: @resource),
+                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 %>
+              <%= t('avo.delete').capitalize %>
+            <% end %>
+          <% end %>
+          <%= 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,
+              style: :primary,
+              icon: 'edit' do %>
+              <%= t('avo.edit').capitalize %>
+            <% end %>
           <% end %>
         <% end %>
       <% end %>
@@ -77,10 +166,12 @@
       <% end %>
     <% end %>
   <% end %>
-  <%= content_tag :div, class: 'space-y-12 mt-12' do %>
-    <% @resource.get_items.each_with_index do |item, index| %>
-      <% next if item.nil? %>
-      <%= render Avo::ItemSwitcherComponent.new resource: @resource, reflection: @reflection, item: item, index: index + 1, view: @view %>
+  <% if @reflection.blank? %>
+    <%= content_tag :div, class: 'space-y-12 mt-12' do %>
+      <% @resource.get_items.each_with_index do |item, index| %>
+        <% next if item.nil? %>
+        <%= render Avo::ItemSwitcherComponent.new resource: @resource, reflection: @reflection, item: item, index: index + 1, view: @view %>
+      <% end %>
     <% end %>
   <% end %>
   <% if should_display_invalid_fields_errors? %>

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

@@ -17,6 +17,7 @@ class Avo::Views::ResourceShowComponent < Avo::ResourceComponent
   def title
     if @reflection.present?
       return field.name if has_one_field?
+
       reflection_resource.name
     else
       @resource.default_panel_name

data/app/controllers/avo/base_controller.rb

@@ -258,18 +258,19 @@ module Avo
     def cast_nullable(params)
       fields = @resource.get_field_definitions
 
-      nullable_fields = fields.filter do |field|
-        field.nullable
-      end
+      nullable_fields = fields
+        .filter do |field|
+          field.nullable
+        end
         .map do |field|
-        [field.id, field.null_values]
-      end
+          [field.id, field.null_values]
+        end
         .to_h
 
       params.each do |key, value|
-        nullable = nullable_fields[key.to_sym]
+        nullable_values = nullable_fields[key.to_sym]
 
-        if nullable.present? && value.in?(nullable)
+        if nullable_values.present? && value.in?(nullable_values)
           params[key] = nil
         end
       end

data/app/javascript/avo.js

@@ -29,7 +29,7 @@ Mousetrap.bind('r r r', () => {
 function isMac() {
   const isMac = window.navigator.userAgent.indexOf('Mac OS X')
 
-  if (isMac) {
+  if (isMac >= 0) {
     document.body.classList.add('os-mac')
     document.body.classList.remove('os-pc')
   } else {

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

@@ -106,13 +106,10 @@ export default class extends Controller {
 
     // enable timezone display
     if (this.enableTimeValue) {
-      console.log(1)
       options.defaultDate = this.parsedValue.setZone(this.displayTimezone).toISO()
 
       options.dateFormat = 'Y-m-d H:i:S'
     } else {
-      console.log(2)
-
       // 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)
@@ -124,6 +121,13 @@ export default class extends Controller {
   }
 
   onChange(selectedDates) {
+    // No date has been selected
+    if (selectedDates.length === 0) {
+      this.updateRealInput('')
+
+      return
+    }
+
     let time
     let args = {}
 

data/app/views/avo/debug/report.html.erb

@@ -9,6 +9,7 @@
   </div>
   <div class="flex justify-end">
     <%= a_button icon: 'heroicons/outline/clipboard',
+      color: :primary,
       style: :primary,
       data: {
         controller: 'copy-to-clipboard',

data/app/views/avo/private/design.html.erb

@@ -1,7 +1,7 @@
 <div class="flex flex-col">
   <%= render Avo::PanelComponent.new(title: 'Welcome to Avo', description: 'This page is visible only in development. It will be hidden in other environments.') do |c| %>
     <% c.tools do %>
-      <%= a_link('/admin', icon: 'arrow-left', style: :primary, is_link: true) do %>
+      <%= a_link('/admin', icon: 'arrow-left', color: :green, style: :primary, is_link: true) do %>
         Primary
       <% end %>
 

data/lib/avo/base_resource.rb

@@ -3,8 +3,8 @@ module Avo
     extend ActiveSupport::DescendantsTracker
 
     include ActionView::Helpers::UrlHelper
-    include Avo::Concerns::HasModel
     include Avo::Concerns::HasFields
+    include Avo::Concerns::HasEditableControls
     include Avo::Concerns::HasStimulusControllers
     include Avo::Concerns::ModelClassConstantized
 
@@ -439,5 +439,9 @@ module Avo
     def ordering_host(**args)
       Avo::Hosts::Ordering.new resource: self, options: self.class.ordering, **args
     end
+
+    def has_model_id?
+      model.present? && model.id.present?
+    end
   end
 end