diff --git a/Gemfile.lock b/Gemfile.lock index b337bf3f07..e166bf0e34 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -107,7 +107,7 @@ GIT PATH remote: . specs: - avo (3.13.7) + avo (3.14.3) actionview (>= 6.1) active_link_to activerecord (>= 6.1) diff --git a/README.md b/README.md index 44eb7fa35d..b74ea91125 100644 --- a/README.md +++ b/README.md @@ -110,7 +110,7 @@ Please read the [RELEASE.MD](./RELEASE.MD) -[Become a sponsor ](https://github.com/sponsors/adrianthedev) +[Become a sponsor](mailto:hi@avohq.io) ![Alt](https://repobeats.axiom.co/api/embed/1481a6a259064f02a7936470d12a50802a9c98a4.svg "Repobeats analytics image") @@ -120,3 +120,10 @@ Please read the [RELEASE.MD](./RELEASE.MD) [Get a box of waffles and some of the best app monitoring from Appsignal](https://appsignal.com/r/93dbe69bfb) 🧇 [Get $100 in credits from Digital Ocean](https://www.digitalocean.com/?refcode=efc1fe881d74&utm_campaign=Referral_Invite&utm_medium=Referral_Program&utm_source=badge) 💸 + +## Other Open Source Work + + - [`active_storage-blurhash`](https://github.com/avo-hq/active_storage-blurhash) - A plug-n-play [blurhash](https://blurha.sh/) integration for images stored in ActiveStorage + - [`class_variants`](https://github.com/avo-hq/class_variants) - Easily configure styles and apply them as classes. Very useful when you're implementing Tailwind CSS components and call them with different states. + - [`prop_initializer`](https://github.com/avo-hq/prop_initializer) - A flexible tool for defining properties on Ruby classes. + - [`stimulus-confetti`](https://github.com/avo-hq/stimulus-confetti) - The easiest way to add confetti to your StimulusJS app diff --git a/app/assets/stylesheets/css/fields/trix.css b/app/assets/stylesheets/css/fields/trix.css index 7e7929820b..7d4113b82c 100644 --- a/app/assets/stylesheets/css/fields/trix.css +++ b/app/assets/stylesheets/css/fields/trix.css @@ -1,5 +1,14 @@ @import './../../../../../node_modules/trix/dist/trix.css'; +.trix-content.hidden { + display: block !important; + clip-path: inset(0 0 calc(100% - 50px) 0); + -webkit-mask-image: linear-gradient(to bottom, black 30px, transparent 50px); + mask-image: linear-gradient(to bottom, black 30px, transparent 50px); + max-height: 50px; + min-height: 0px; +} + .trix-content h1 { @apply text-xl font-bold mb-2; } diff --git a/app/components/avo/actions_component.rb b/app/components/avo/actions_component.rb index 59754068e3..2e809a809c 100644 --- a/app/components/avo/actions_component.rb +++ b/app/components/avo/actions_component.rb @@ -68,7 +68,7 @@ def icon(icon) def render_item(action) case action when Avo::Divider - render_divider(action) + render Avo::DividerComponent.new(action.label) when Avo::BaseAction render_action_link(action) when defined?(Avo::Advanced::Resources::Controls::Action) && Avo::Advanced::Resources::Controls::Action @@ -84,11 +84,6 @@ def render_item(action) private - def render_divider(action) - label = action.label.is_a?(Hash) ? action.label[:label] : nil - render Avo::DividerComponent.new(label) - end - def render_action_link(action, icon: nil) link_to action.link_arguments(resource: @resource, arguments: action.arguments).first, data: action_data_attributes(action), diff --git a/app/components/avo/button_component.rb b/app/components/avo/button_component.rb index 09926c4da8..dad7004729 100644 --- a/app/components/avo/button_component.rb +++ b/app/components/avo/button_component.rb @@ -57,11 +57,9 @@ def is_not_icon? def full_content result = "" - icon_classes = @icon_class # space out the icon from the text if text is present - icon_classes += " mr-1" if content.present? && is_not_icon? # add the icon height - icon_classes += icon_size_classes + icon_classes = class_names(@icon_class, "pointer-events-none", icon_size_classes, "mr-1": content.present? && is_not_icon?) # Add the icon result += helpers.svg(@icon, class: icon_classes) if @icon.present? diff --git a/app/components/avo/fields/belongs_to_field/edit_component.html.erb b/app/components/avo/fields/belongs_to_field/edit_component.html.erb index e2fd48bd1c..b38be635bd 100644 --- a/app/components/avo/fields/belongs_to_field/edit_component.html.erb +++ b/app/components/avo/fields/belongs_to_field/edit_component.html.erb @@ -49,10 +49,9 @@ <% else %> <%= @form.select @field.id_input_foreign_key, options_for_select( - # Options @field.values_for_type(type), - # Selected - @field.value.is_a?(type) ? @field.value.to_param : nil + selected: @field.value.is_a?(type) ? @field.value.to_param : nil, + disabled: t("avo.more_records_available") ), { include_blank: @field.placeholder, @@ -103,7 +102,7 @@ %> <% else %> <%= @form.select @field.id_input_foreign_key, - options_for_select(@field.options, @field.value.to_param), + options_for_select(@field.options, selected: @field.value.to_param, disabled: t("avo.more_records_available")), { include_blank: @field.placeholder, }, diff --git a/app/components/avo/fields/common/key_value_component.html.erb b/app/components/avo/fields/common/key_value_component.html.erb index 1ba7262502..3e32e12935 100644 --- a/app/components/avo/fields/common/key_value_component.html.erb +++ b/app/components/avo/fields/common/key_value_component.html.erb @@ -15,7 +15,7 @@ <%= @field.value_label %> <% if @view.form? %> -
+
<% if can_upload_file? %> - <%= @form.file_field @field.id, - accept: @field.accept, - data: @field.get_html(:data, view: view, element: :input), - direct_upload: @field.direct_upload, - disabled: disabled?, - style: @field.get_html(:style, view: view, element: :input), - autofocus: @autofocus, - class: "w-full" - %> +
+
+ <%= @form.file_field @field.id, + accept: @field.accept, + data: @field.get_html(:data, view: view, element: :input) + .merge( + action: "change->clear-input#showClearButton", + clear_input_target: "input" + ), + direct_upload: @field.direct_upload, + disabled: disabled?, + style: @field.get_html(:style, view: view, element: :input), + autofocus: @autofocus, + class: "w-full" + %> +
+ <%= content_tag :button, + class: "self-center hidden font-semibold text-xs text-red-600 p-1", + id: :reset, + type: :button, + data: { + clear_input_target: "clearButton", + action: "click->clear-input#clearInput", + tippy: :tooltip + } do %> + <% t("avo.clear_value") %> + <% end %> +
<% else %> — <% end %> diff --git a/app/components/avo/fields/files_field/edit_component.html.erb b/app/components/avo/fields/files_field/edit_component.html.erb index eebbac70ae..78416306f3 100644 --- a/app/components/avo/fields/files_field/edit_component.html.erb +++ b/app/components/avo/fields/files_field/edit_component.html.erb @@ -2,17 +2,33 @@ <%= render Avo::Fields::Common::Files::ListViewerComponent.new(field: @field, resource: @resource) if @field.value.present? %> <% if can_upload_file? %> -
- <%= @form.file_field @field.id, - accept: @field.accept, - data: @field.get_html(:data, view: view, element: :input), - direct_upload: @field.direct_upload, - disabled: disabled?, - multiple: true, - style: @field.get_html(:style, view: view, element: :input), - class: "w-full", - autofocus: @autofocus - %> +
+
+ <%= @form.file_field @field.id, + accept: @field.accept, + data: @field.get_html(:data, view: view, element: :input) + .merge( + action: "change->clear-input#showClearButton", + clear_input_target: "input" + ), + direct_upload: @field.direct_upload, + disabled: disabled?, + multiple: true, + style: @field.get_html(:style, view: view, element: :input), + autofocus: @autofocus + %> +
+ <%= content_tag :button, + class: "self-center hidden font-semibold text-xs text-red-600 p-1", + id: :reset, + type: :button, + data: { + clear_input_target: "clearButton", + action: "click->clear-input#clearInput", + tippy: :tooltip + } do %> + <% t("avo.clear_value") %> + <% end %>
<% else %> — diff --git a/app/components/avo/fields/radio_field/edit_component.html.erb b/app/components/avo/fields/radio_field/edit_component.html.erb new file mode 100644 index 0000000000..8e304a1dcf --- /dev/null +++ b/app/components/avo/fields/radio_field/edit_component.html.erb @@ -0,0 +1,10 @@ +<%= field_wrapper **field_wrapper_args do %> +
+ <% @field.options.each do |key, value| %> +
+ <%= form.radio_button @field.id, key %> + <%= form.label @field.id, value: value %> +
+ <% end %> +
+<% end %> diff --git a/app/components/avo/fields/radio_field/edit_component.rb b/app/components/avo/fields/radio_field/edit_component.rb new file mode 100644 index 0000000000..114a70156e --- /dev/null +++ b/app/components/avo/fields/radio_field/edit_component.rb @@ -0,0 +1,4 @@ +# frozen_string_literal: true + +class Avo::Fields::RadioField::EditComponent < Avo::Fields::EditComponent +end diff --git a/app/components/avo/fields/radio_field/index_component.html.erb b/app/components/avo/fields/radio_field/index_component.html.erb new file mode 100644 index 0000000000..8d4e9d5fda --- /dev/null +++ b/app/components/avo/fields/radio_field/index_component.html.erb @@ -0,0 +1,3 @@ +<%= index_field_wrapper **field_wrapper_args do %> + <%== @field.value %> +<% end %> diff --git a/app/components/avo/fields/radio_field/index_component.rb b/app/components/avo/fields/radio_field/index_component.rb new file mode 100644 index 0000000000..6e2b2b46c2 --- /dev/null +++ b/app/components/avo/fields/radio_field/index_component.rb @@ -0,0 +1,4 @@ +# frozen_string_literal: true + +class Avo::Fields::RadioField::IndexComponent < Avo::Fields::IndexComponent +end diff --git a/app/components/avo/fields/radio_field/show_component.html.erb b/app/components/avo/fields/radio_field/show_component.html.erb new file mode 100644 index 0000000000..de7fe73231 --- /dev/null +++ b/app/components/avo/fields/radio_field/show_component.html.erb @@ -0,0 +1,3 @@ +<%= field_wrapper **field_wrapper_args do %> + <%== @field.value %> +<% end %> diff --git a/app/components/avo/fields/radio_field/show_component.rb b/app/components/avo/fields/radio_field/show_component.rb new file mode 100644 index 0000000000..65cac0d7a1 --- /dev/null +++ b/app/components/avo/fields/radio_field/show_component.rb @@ -0,0 +1,4 @@ +# frozen_string_literal: true + +class Avo::Fields::RadioField::ShowComponent < Avo::Fields::ShowComponent +end diff --git a/app/components/avo/fields/trix_field/show_component.html.erb b/app/components/avo/fields/trix_field/show_component.html.erb index 7b7d310efe..f4e245781f 100644 --- a/app/components/avo/fields/trix_field/show_component.html.erb +++ b/app/components/avo/fields/trix_field/show_component.html.erb @@ -2,13 +2,19 @@ <% content_classes = 'trix-content py-2 max-w-4xl' content_classes << ' hidden' unless @field.always_show + button_classes = 'font-bold inline-block pt-3' %> -
- <% unless @field.always_show %> - <%= link_to t('avo.show_content'), 'javascript:void(0);', class: 'font-bold inline-block', data: { action: 'click->hidden-input#showContent' } %> - <% end %> -
+
+
<%= sanitize @field.value.to_s %>
+ <% unless @field.always_show %> + + + <% end %>
<% end %> diff --git a/app/components/avo/index/table_row_component.html.erb b/app/components/avo/index/table_row_component.html.erb index 0dff9248bf..1f682ab548 100644 --- a/app/components/avo/index/table_row_component.html.erb +++ b/app/components/avo/index/table_row_component.html.erb @@ -1,6 +1,7 @@ <%# hover:z-[21] removed from tr class to solve flickering actions component on row controls and z-20 changed to z-21%> <%= content_tag :tr, + id: "#{self.class.to_s.underscore}_#{@resource.record.to_param}", class: class_names("bg-white hover:bg-gray-50 hover:shadow-row z-21 border-b", {"cursor-pointer": click_row_to_view_record}), data: { component_name: self.class.to_s.underscore, diff --git a/app/components/avo/modal_component.html.erb b/app/components/avo/modal_component.html.erb index 883937dedb..a074beb9c5 100644 --- a/app/components/avo/modal_component.html.erb +++ b/app/components/avo/modal_component.html.erb @@ -1,8 +1,9 @@
-
+
- diff --git a/app/components/avo/modal_component.rb b/app/components/avo/modal_component.rb index eb40f2470f..29090bf18c 100644 --- a/app/components/avo/modal_component.rb +++ b/app/components/avo/modal_component.rb @@ -7,6 +7,7 @@ class Avo::ModalComponent < Avo::BaseComponent prop :width, default: :md prop :body_class prop :overflow, default: :auto + prop :close_modal_on_backdrop_click, default: true, reader: :public def width_classes case @width.to_sym diff --git a/app/components/avo/panel_component.html.erb b/app/components/avo/panel_component.html.erb index 9258d5b6cf..cb97b26a4d 100644 --- a/app/components/avo/panel_component.html.erb +++ b/app/components/avo/panel_component.html.erb @@ -6,11 +6,7 @@
<%= render Avo::ProfilePhotoComponent.new profile_photo: @profile_photo %>
- <% if display_breadcrumbs? %> -
- <%= helpers.render_avo_breadcrumbs(separator: helpers.svg("chevron-right", class: "inline-block h-3 stroke-current relative top-[-1px] ml-1")) if Avo.configuration.display_breadcrumbs %> -
- <% end %> + <%= render partial: "avo/partials/panel_breadcrumbs" if display_breadcrumbs? %>
<% if name_slot? %> diff --git a/app/components/avo/sidebar_component.html.erb b/app/components/avo/sidebar_component.html.erb index 0d39a929b7..f43d39f811 100644 --- a/app/components/avo/sidebar_component.html.erb +++ b/app/components/avo/sidebar_component.html.erb @@ -1,7 +1,12 @@ -
+<%= content_tag :div, + class: class_names( + "avo-sidebar fixed z-[60] t-0 application-sidebar w-64 flex-1 border-r lg:border-none bg-none xh-dvh h-[calc(100dvh-4rem)] bg-application lg:bg-transparent", + "print:hidden": Avo.configuration.hide_layout_when_printing, + "hidden": !@sidebar_open, + ), + data: { + sidebar_target: stimulus_target + } do %>
@@ -61,4 +66,4 @@ <% end %> <%= render Avo::SidebarProfileComponent.new user: helpers._current_user %>
-
+<% end %> diff --git a/app/components/avo/sidebar_profile_component.html.erb b/app/components/avo/sidebar_profile_component.html.erb index 1e679aa517..45aa44cd8f 100644 --- a/app/components/avo/sidebar_profile_component.html.erb +++ b/app/components/avo/sidebar_profile_component.html.erb @@ -21,14 +21,14 @@ <%= helpers.svg "avo/three-dots", class: 'h-4' %>
diff --git a/app/components/avo/sidebar_profile_component.rb b/app/components/avo/sidebar_profile_component.rb index e21416267c..177e8fa687 100644 --- a/app/components/avo/sidebar_profile_component.rb +++ b/app/components/avo/sidebar_profile_component.rb @@ -3,6 +3,8 @@ class Avo::SidebarProfileComponent < Avo::BaseComponent prop :user + delegate :main_app, to: :helpers + def avatar if @user.respond_to?(:avatar) && @user.avatar.present? @user.avatar @@ -31,13 +33,24 @@ def title end end - def destroy_user_session_path - # If `sign_out_path_name` is configured, use it. Otherwise construct the - # path name based on `current_user_resource_name`. - (Avo.configuration.sign_out_path_name || "destroy_#{Avo.configuration.current_user_resource_name}_session_path").to_sym + def sign_out_method + :delete + end + + def sign_out_path + return Avo.configuration.sign_out_path_name if Avo.configuration.sign_out_path_name.present? + return :session_path if helpers.possibly_rails_authentication? + + default_sign_out_path + end + + def default_sign_out_path + default_path = :"destroy_#{Avo.configuration.current_user_resource_name}_session_path" + + default_path if main_app.respond_to?(default_path) end - def can_destroy_user? - helpers.main_app.respond_to?(destroy_user_session_path) + def can_sign_out_user? + sign_out_path.present? && main_app.respond_to?(sign_out_path&.to_sym) end end diff --git a/app/controllers/avo/application_controller.rb b/app/controllers/avo/application_controller.rb index 0895cb295d..929d1d55ca 100644 --- a/app/controllers/avo/application_controller.rb +++ b/app/controllers/avo/application_controller.rb @@ -1,340 +1,4 @@ module Avo - class ApplicationController < ::ActionController::Base - if defined?(Pundit::Authorization) - Avo::ApplicationController.include Pundit::Authorization - elsif defined?(Pundit) - Avo::ApplicationController.include Pundit - end - - include Avo::InitializesAvo - include Avo::CommonController - include Avo::ApplicationHelper - include Avo::UrlHelpers - include Avo::Concerns::Breadcrumbs - include Avo::Concerns::FindAssociationField - - protect_from_forgery with: :exception - around_action :set_avo_locale - around_action :set_force_locale, if: -> { params[:force_locale].present? } - before_action :init_app - before_action :set_active_storage_current_host - before_action :set_resource_name - before_action :_authenticate! - before_action :set_authorization - before_action :set_container_classes - before_action :add_initial_breadcrumbs - before_action :set_view - before_action :set_sidebar_open - before_action :set_stylesheet_assets_path - - rescue_from Avo::NotAuthorizedError, with: :render_unauthorized - rescue_from ActiveRecord::RecordInvalid, with: :exception_logger - - helper_method :_current_user, :resources_path, :resource_path, :new_resource_path, :edit_resource_path, :resource_attach_path, :resource_detach_path, :related_resources_path, :turbo_frame_request?, :resource_view_path, :preview_resource_path - add_flash_types :info, :warning, :success, :error - - def exception_logger(exception) - respond_to do |format| - format.html { raise exception } - format.json { - render json: { - errors: (exception.respond_to?(:record) && exception.record.present?) ? exception.record.errors : [], - message: exception.message, - traces: exception.backtrace - }, status: ActionDispatch::ExceptionWrapper.status_code_for_exception(exception.class.name) - } - end - end - - # This is coming from Turbo::Frames::FrameRequest module. - # Exposing it as public method - def turbo_frame_request? - super - end - - private - - # Get the pluralized resource name for this request - # Ex: projects, teams, users - def resource_name - return params[:resource_name] if params[:resource_name].present? - - return controller_name if controller_name.present? - - begin - request.path - .match(/\/?#{Avo.root_path.delete("/")}\/resources\/([a-z1-9\-_]*)\/?/mi) - .captures - .first - rescue - end - end - - def related_resource_name - params[:related_name] - end - - # Gets the Avo resource for this request based on the request from the `resource_name` "param" - # Ex: Avo::Resources::Project, Avo::Resources::Team, Avo::Resources::User - def resource - resource = Avo.resource_manager.get_resource @resource_name.to_s.camelize.singularize - - return resource if resource.present? - - Avo.resource_manager.get_resource_by_controller_name @resource_name - end - - def related_resource - # Find the field from the parent resource - field = find_association_field(resource: @resource, association: params[:related_name]) - - return field.use_resource if field&.use_resource.present? - - reflection = @record.class.reflect_on_association(field&.for_attribute || params[:related_name]) - - reflected_model = reflection.klass - - Avo.resource_manager.get_resource_by_model_class reflected_model - end - - def set_resource_name - @resource_name = resource_name - end - - def set_related_resource_name - @related_resource_name = related_resource_name - end - - def set_resource - raise ActionController::RoutingError.new "No route matches" if resource.nil? - - @resource = resource.new(view: params[:view].presence || action_name.to_s, user: _current_user, params: params) - - set_authorization - end - - def detect_fields - @resource.detect_fields - end - - def set_related_resource - raise Avo::MissingResourceError.new(related_resource_name) if related_resource.nil? - - action_view = action_name.to_sym - - # Get view from params unless actions is index or show or forms... - # Else, for example for detach action we want the view from params to can fetch the correct fields - # This logic avoid the following scenario: - # When a has many field is rendered the action is index and params[:view] is show or edit but we want to - # keep @view as index for the related_resource - # Same do not happen with other actions except the list below. - view = if action_view.in?([:index, :show, :new, :edit, :create]) - action_view - else - params[:view].presence || action_view - end - - @related_resource = related_resource.new( - params: params, - view: view, - user: _current_user, - record: @related_record - ).detect_fields - end - - def set_record - id = if @resource.model_class.primary_key.is_a?(Array) && params.respond_to?(:extract_value) - params.extract_value(:id) - else - params[:id] - end - - @record = @resource.find_record(id, query: model_scope, params:) - @resource.hydrate(record: @record) - end - - def set_related_record - association_name = BaseResource.valid_association_name(@record, params[:related_name]) - @related_record = if @field.is_a? Avo::Fields::HasOneField - @record.send association_name - else - @related_resource.find_record params[:related_id], query: @record.send(association_name), params: params - end - @related_resource.hydrate(record: @related_record) - end - - def model_scope - # abort @resource.inspect - @resource.class.find_scope - end - - # Force actions to have specific view - unless defined? VIEW_ACTION_MAPPING - VIEW_ACTION_MAPPING = { - update: :edit, - create: :new - } - end - - def set_view - @view = Avo::ViewInquirer.new(VIEW_ACTION_MAPPING[action_name.to_sym] || action_name) - end - - def set_record_to_fill - @record_to_fill = if @view.new? - @resource.model_class.new - elsif @view.edit? - @record - end - - # If resource.record is nil, most likely the user is creating a new record. - # In that case, to access resource.record in visible and readonly blocks we hydrate the resource with a new record. - # TODO: commented this - @resource.hydrate(record: @record_to_fill) if @resource.record.nil? - end - - def fill_record - # We have to skip filling the the record if this is an attach action - return if is_attach_action? - - @record = @resource.fill_record(@record_to_fill, cast_nullable(model_params), extra_params: extra_params) - assign_default_value_to_disabled_fields if @view.create? - end - - def is_attach_action? - params[model_param_key].blank? && params[:related_name].present? && params[:fields].present? - end - - def assign_default_value_to_disabled_fields - @resource.get_field_definitions.select do |field| - field.is_disabled? && field.visible? && !field.computed - end.each do |field| - # Get the default value from the field default definition - # If there is no default value specified on the resource, get the value from the record (DB, Callbacks, etc.) - default_value = field.default || @record.send(field.id) - field.fill_field @record, field.id, default_value, params - end - end - - def authorize_base_action - class_to_authorize = @record || @resource.model_class - - authorize_action class_to_authorize - end - - def authorize_action(class_to_authorize, action = nil) - # Use the provided action or figure it out from the request - action_to_authorize = action || action_name - - @authorization.set_record(class_to_authorize).authorize_action action_to_authorize.to_sym - end - - def _authenticate! - instance_eval(&Avo.configuration.authenticate) - end - - def render_unauthorized(exception) - flash[:notice] = t "avo.not_authorized" - - redirect_url = if request.referrer.blank? || (request.referrer == request.url) - root_url - else - request.referrer - end - - redirect_to(redirect_url) - end - - def set_authorization - # We need to set @resource_name for the #resource method to work properly - set_resource_name - @authorization = if @resource - @resource.authorization(user: _current_user) - else - Services::AuthorizationService.new _current_user - end - end - - def set_container_classes - contain = true - - if Avo.configuration.full_width_container - contain = false - elsif Avo.configuration.full_width_index_view && action_name.to_sym == :index && self.class.superclass.to_s == "Avo::ResourcesController" - contain = false - end - - @container_classes = contain ? "2xl:container 2xl:mx-auto" : "" - end - - def add_initial_breadcrumbs - instance_eval(&Avo.configuration.initial_breadcrumbs) if Avo.configuration.initial_breadcrumbs.present? - end - - def model_param_key - @resource.form_scope - end - - # Sets the locale set in avo.rb initializer or if to something that the user set using the `?set_locale=pt-BR` param - def set_avo_locale(&action) - locale = Avo.configuration.default_locale - - if params[:set_locale].present? - locale = params[:set_locale] - Avo.configuration.locale = locale - end - - I18n.with_locale(locale, &action) - end - - # Temporary set the locale and reverting at the end of the request. - def set_force_locale(&action) - I18n.with_locale(params[:force_locale], &action) - end - - def set_sidebar_open - value = cookies["#{Avo::COOKIES_KEY}.sidebar.open"] - @sidebar_open = value.blank? || value == "1" - end - - # Set the current host for ActiveStorage - def set_active_storage_current_host - if defined?(ActiveStorage::Current) - if Rails::VERSION::MAJOR === 6 - ActiveStorage::Current.host = request.base_url - elsif Rails::VERSION::MAJOR === 7 - ActiveStorage::Current.url_options = {protocol: request.protocol, host: request.host, port: request.port} - end - end - rescue => exception - Avo.logger.debug "Failed to set ActiveStorage::Current.url_options, #{exception.inspect}" - end - - def set_stylesheet_assets_path - # Prefer the user's tailwind config if it exists, otherwise use the default one from Avo - @stylesheet_assets_path = if Rails.root.join("config", "avo", "tailwind.config.js").exist? - "avo.tailwind" - elsif Avo::PACKED - "/avo-assets/avo.base" - else - "avo.base" - end - end - - def choose_layout - if turbo_frame_request? - "avo/blank" - else - "avo/application" - end - end - - def authenticate_developer_or_admin! - raise_404 unless Avo::Current.user_is_developer? || Avo::Current.user_is_admin? - end - - def raise_404 - raise ActionController::RoutingError.new "No route matches" - end + class ApplicationController < BaseApplicationController end end diff --git a/app/controllers/avo/associations_controller.rb b/app/controllers/avo/associations_controller.rb index 7b6a74e6c3..5542f51a9b 100644 --- a/app/controllers/avo/associations_controller.rb +++ b/app/controllers/avo/associations_controller.rb @@ -60,9 +60,7 @@ def new query = Avo::ExecutionContext.new(target: @field.attach_scope, query: query, parent: @record).handle end - @options = query.all.map do |record| - [@attachment_resource.new(record: record).record_title, record.to_param] - end + @options = select_options(query) end @url = Avo::Services::URIService.parse(avo.root_url.to_s) @@ -117,6 +115,13 @@ def destroy def set_reflection @reflection = @record.class.reflect_on_association(association_from_params) + + # Ensure inverse_of is present on STI + if !@record.class.descends_from_active_record? && @reflection.inverse_of.blank? && Rails.env.development? + raise "Avo relies on the 'inverse_of' option to establish the inverse association and perform some specific logic.\n" \ + "Please configure the 'inverse_of' option for the '#{@reflection.macro} :#{@reflection.name}' association " \ + "in the '#{@reflection.active_record.name}' model." + end end def set_attachment_class @@ -150,11 +155,13 @@ def reflection_class end def authorize_if_defined(method, record = @record) + return unless Avo.configuration.authorization_enabled? + @authorization.set_record(record) if @authorization.has_method?(method.to_sym) @authorization.authorize_action method.to_sym - elsif !@authorization.is_a?(Avo::Services::AuthorizationService) && Avo.configuration.explicit_authorization + elsif Avo.configuration.explicit_authorization raise Avo::NotAuthorizedError.new end end @@ -275,5 +282,13 @@ def destroy_success_action end end end + + def select_options(query) + query.all.limit(Avo.configuration.associations_lookup_list_limit).map do |record| + [@attachment_resource.new(record: record).record_title, record.to_param] + end.tap do |options| + options << t("avo.more_records_available") if options.size == Avo.configuration.associations_lookup_list_limit + end + end end end diff --git a/app/controllers/avo/base_application_controller.rb b/app/controllers/avo/base_application_controller.rb new file mode 100644 index 0000000000..499524cc85 --- /dev/null +++ b/app/controllers/avo/base_application_controller.rb @@ -0,0 +1,340 @@ +module Avo + class BaseApplicationController < ::ActionController::Base + if defined?(Pundit::Authorization) + Avo::BaseApplicationController.include Pundit::Authorization + elsif defined?(Pundit) + Avo::BaseApplicationController.include Pundit + end + + include Avo::InitializesAvo + include Avo::CommonController + include Avo::ApplicationHelper + include Avo::UrlHelpers + include Avo::Concerns::Breadcrumbs + include Avo::Concerns::FindAssociationField + + protect_from_forgery with: :exception + around_action :set_avo_locale + around_action :set_force_locale, if: -> { params[:force_locale].present? } + before_action :init_app + before_action :set_active_storage_current_host + before_action :set_resource_name + before_action :_authenticate! + before_action :set_authorization + before_action :set_container_classes + before_action :add_initial_breadcrumbs + before_action :set_view + before_action :set_sidebar_open + before_action :set_stylesheet_assets_path + + rescue_from Avo::NotAuthorizedError, with: :render_unauthorized + rescue_from ActiveRecord::RecordInvalid, with: :exception_logger + + helper_method :_current_user, :resources_path, :resource_path, :new_resource_path, :edit_resource_path, :resource_attach_path, :resource_detach_path, :related_resources_path, :turbo_frame_request?, :resource_view_path, :preview_resource_path + add_flash_types :info, :warning, :success, :error + + def exception_logger(exception) + respond_to do |format| + format.html { raise exception } + format.json { + render json: { + errors: (exception.respond_to?(:record) && exception.record.present?) ? exception.record.errors : [], + message: exception.message, + traces: exception.backtrace + }, status: ActionDispatch::ExceptionWrapper.status_code_for_exception(exception.class.name) + } + end + end + + # This is coming from Turbo::Frames::FrameRequest module. + # Exposing it as public method + def turbo_frame_request? + super + end + + private + + # Get the pluralized resource name for this request + # Ex: projects, teams, users + def resource_name + return params[:resource_name] if params[:resource_name].present? + + return controller_name if controller_name.present? + + begin + request.path + .match(/\/?#{Avo.root_path.delete("/")}\/resources\/([a-z1-9\-_]*)\/?/mi) + .captures + .first + rescue + end + end + + def related_resource_name + params[:related_name] + end + + # Gets the Avo resource for this request based on the request from the `resource_name` "param" + # Ex: Avo::Resources::Project, Avo::Resources::Team, Avo::Resources::User + def resource + resource = Avo.resource_manager.get_resource @resource_name.to_s.camelize.singularize + + return resource if resource.present? + + Avo.resource_manager.get_resource_by_controller_name @resource_name + end + + def related_resource + # Find the field from the parent resource + field = find_association_field(resource: @resource, association: params[:related_name]) + + return field.use_resource if field&.use_resource.present? + + reflection = @record.class.reflect_on_association(field&.for_attribute || params[:related_name]) + + reflected_model = reflection.klass + + Avo.resource_manager.get_resource_by_model_class reflected_model + end + + def set_resource_name + @resource_name = resource_name + end + + def set_related_resource_name + @related_resource_name = related_resource_name + end + + def set_resource + raise ActionController::RoutingError.new "No route matches" if resource.nil? + + @resource = resource.new(view: params[:view].presence || action_name.to_s, user: _current_user, params: params) + + set_authorization + end + + def detect_fields + @resource.detect_fields + end + + def set_related_resource + raise Avo::MissingResourceError.new(related_resource_name) if related_resource.nil? + + action_view = action_name.to_sym + + # Get view from params unless actions is index or show or forms... + # Else, for example for detach action we want the view from params to can fetch the correct fields + # This logic avoid the following scenario: + # When a has many field is rendered the action is index and params[:view] is show or edit but we want to + # keep @view as index for the related_resource + # Same do not happen with other actions except the list below. + view = if action_view.in?([:index, :show, :new, :edit, :create]) + action_view + else + params[:view].presence || action_view + end + + @related_resource = related_resource.new( + params: params, + view: view, + user: _current_user, + record: @related_record + ).detect_fields + end + + def set_record + id = if @resource.model_class.primary_key.is_a?(Array) && params.respond_to?(:extract_value) + params.extract_value(:id) + else + params[:id] + end + + @record = @resource.find_record(id, query: model_scope, params:) + @resource.hydrate(record: @record) + end + + def set_related_record + association_name = BaseResource.valid_association_name(@record, params[:related_name]) + @related_record = if @field.is_a? Avo::Fields::HasOneField + @record.send association_name + else + @related_resource.find_record params[:related_id], query: @record.send(association_name), params: params + end + @related_resource.hydrate(record: @related_record) + end + + def model_scope + # abort @resource.inspect + @resource.class.find_scope + end + + # Force actions to have specific view + unless defined? VIEW_ACTION_MAPPING + VIEW_ACTION_MAPPING = { + update: :edit, + create: :new + } + end + + def set_view + @view = Avo::ViewInquirer.new(VIEW_ACTION_MAPPING[action_name.to_sym] || action_name) + end + + def set_record_to_fill + @record_to_fill = if @view.new? + @resource.model_class.new + elsif @view.edit? + @record + end + + # If resource.record is nil, most likely the user is creating a new record. + # In that case, to access resource.record in visible and readonly blocks we hydrate the resource with a new record. + # TODO: commented this + @resource.hydrate(record: @record_to_fill) if @resource.record.nil? + end + + def fill_record + # We have to skip filling the the record if this is an attach action + return if is_attach_action? + + @record = @resource.fill_record(@record_to_fill, cast_nullable(model_params), extra_params: extra_params) + assign_default_value_to_disabled_fields if @view.create? + end + + def is_attach_action? + params[model_param_key].blank? && params[:related_name].present? && params[:fields].present? + end + + def assign_default_value_to_disabled_fields + @resource.get_field_definitions.select do |field| + field.is_disabled? && field.visible? && !field.computed + end.each do |field| + # Get the default value from the field default definition + # If there is no default value specified on the resource, get the value from the record (DB, Callbacks, etc.) + default_value = field.default || @record.send(field.id) + field.fill_field @record, field.id, default_value, params + end + end + + def authorize_base_action + class_to_authorize = @record || @resource.model_class + + authorize_action class_to_authorize + end + + def authorize_action(class_to_authorize, action = nil) + # Use the provided action or figure it out from the request + action_to_authorize = action || action_name + + @authorization.set_record(class_to_authorize).authorize_action action_to_authorize.to_sym + end + + def _authenticate! + instance_eval(&Avo.configuration.authenticate) + end + + def render_unauthorized(exception) + flash[:notice] = t "avo.not_authorized" + + redirect_url = if request.referrer.blank? || (request.referrer == request.url) + root_url + else + request.referrer + end + + redirect_to(redirect_url) + end + + def set_authorization + # We need to set @resource_name for the #resource method to work properly + set_resource_name + @authorization = if @resource + @resource.authorization(user: _current_user) + else + Services::AuthorizationService.new _current_user + end + end + + def set_container_classes + contain = true + + if Avo.configuration.full_width_container + contain = false + elsif Avo.configuration.full_width_index_view && action_name.to_sym == :index && self.class.superclass.to_s == "Avo::ResourcesController" + contain = false + end + + @container_classes = contain ? "2xl:container 2xl:mx-auto" : "" + end + + def add_initial_breadcrumbs + instance_eval(&Avo.configuration.initial_breadcrumbs) if Avo.configuration.initial_breadcrumbs.present? + end + + def model_param_key + @resource.form_scope + end + + # Sets the locale set in avo.rb initializer or if to something that the user set using the `?set_locale=pt-BR` param + def set_avo_locale(&action) + locale = Avo.configuration.default_locale + + if params[:set_locale].present? + locale = params[:set_locale] + Avo.configuration.locale = locale + end + + I18n.with_locale(locale, &action) + end + + # Temporary set the locale and reverting at the end of the request. + def set_force_locale(&action) + I18n.with_locale(params[:force_locale], &action) + end + + def set_sidebar_open + value = cookies["#{Avo::COOKIES_KEY}.sidebar.open"] + @sidebar_open = value.blank? || value == "1" + end + + # Set the current host for ActiveStorage + def set_active_storage_current_host + if defined?(ActiveStorage::Current) + if Rails::VERSION::MAJOR === 6 + ActiveStorage::Current.host = request.base_url + elsif Gem::Version.new(Rails.version) >= Gem::Version.new("7.0.0") + ActiveStorage::Current.url_options = {protocol: request.protocol, host: request.host, port: request.port} + end + end + rescue => exception + Avo.logger.debug "Failed to set ActiveStorage::Current.url_options, #{exception.inspect}" + end + + def set_stylesheet_assets_path + # Prefer the user's tailwind config if it exists, otherwise use the default one from Avo + @stylesheet_assets_path = if Rails.root.join("config", "avo", "tailwind.config.js").exist? + "avo.tailwind" + elsif Avo::PACKED + "/avo-assets/avo.base" + else + "avo.base" + end + end + + def choose_layout + if turbo_frame_request? + "avo/blank" + else + "avo/application" + end + end + + def authenticate_developer_or_admin! + raise_404 unless Avo::Current.user_is_developer? || Avo::Current.user_is_admin? + end + + def raise_404 + raise ActionController::RoutingError.new "No route matches" + end + end +end diff --git a/app/helpers/avo/application_helper.rb b/app/helpers/avo/application_helper.rb index c9babc1418..d3bc0f216a 100644 --- a/app/helpers/avo/application_helper.rb +++ b/app/helpers/avo/application_helper.rb @@ -141,6 +141,10 @@ def chart_color(index) Avo.configuration.branding.chart_colors[index % Avo.configuration.branding.chart_colors.length] end + def possibly_rails_authentication? + defined?(Authentication) && Authentication.private_instance_methods.include?(:require_authentication) && Authentication.private_instance_methods.include?(:authenticated?) + end + private # Taken from the original library diff --git a/app/javascript/js/controllers.js b/app/javascript/js/controllers.js index ff30529b03..de91a986b0 100644 --- a/app/javascript/js/controllers.js +++ b/app/javascript/js/controllers.js @@ -7,6 +7,7 @@ import AttachmentsController from './controllers/attachments_controller' import BelongsToFieldController from './controllers/fields/belongs_to_field_controller' import BooleanFilterController from './controllers/boolean_filter_controller' import CardFiltersController from './controllers/card_filters_controller' +import ClearInputController from './controllers/fields/clear_input_controller' import CodeFieldController from './controllers/fields/code_field_controller' import CopyToClipboardController from './controllers/copy_to_clipboard_controller' import DashboardCardController from './controllers/dashboard_card_controller' @@ -44,6 +45,7 @@ import TextFilterController from './controllers/text_filter_controller' import TippyController from './controllers/tippy_controller' import TiptapFieldController from './controllers/fields/tiptap_field_controller' import ToggleController from './controllers/toggle_controller' +import TrixBodyController from './controllers/trix_body_controller' import TrixFieldController from './controllers/fields/trix_field_controller' application.register('action', ActionController) @@ -52,6 +54,7 @@ application.register('actions-picker', ActionsPickerController) application.register('attachments', AttachmentsController) application.register('boolean-filter', BooleanFilterController) application.register('card-filters', CardFiltersController) +application.register('clear-input', ClearInputController) application.register('copy-to-clipboard', CopyToClipboardController) application.register('dashboard-card', DashboardCardController) application.register('date-time-filter', DateTimeFilterController) @@ -81,6 +84,7 @@ application.register('table-row', TableRowController) application.register('text-filter', TextFilterController) application.register('tippy', TippyController) application.register('toggle', ToggleController) +application.register('trix-body', TrixBodyController) // Field controllers application.register('belongs-to-field', BelongsToFieldController) diff --git a/app/javascript/js/controllers/fields/clear_input_controller.js b/app/javascript/js/controllers/fields/clear_input_controller.js new file mode 100644 index 0000000000..1c51d7eca3 --- /dev/null +++ b/app/javascript/js/controllers/fields/clear_input_controller.js @@ -0,0 +1,14 @@ +import { Controller } from '@hotwired/stimulus' + +export default class extends Controller { + static targets = ['input', 'clearButton'] + + showClearButton() { + this.clearButtonTarget.classList.remove('hidden') + } + + clearInput() { + this.inputTarget.value = '' + this.clearButtonTarget.classList.add('hidden') + } +} diff --git a/app/javascript/js/controllers/fields/key_value_controller.js b/app/javascript/js/controllers/fields/key_value_controller.js index dfa0b05255..6602b15be9 100644 --- a/app/javascript/js/controllers/fields/key_value_controller.js +++ b/app/javascript/js/controllers/fields/key_value_controller.js @@ -2,6 +2,7 @@ import * as DOMPurify from 'dompurify' import { Controller } from '@hotwired/stimulus' import { castBoolean } from '../../helpers/cast_boolean' +import Sortable from 'sortablejs' export default class extends Controller { static targets = ['input', 'controller', 'rows'] @@ -46,6 +47,27 @@ export default class extends Controller { this.updateKeyValueComponent() } + moveKey(fromIndex, toIndex) { + if (!this.options.editable) return + + this.fieldValue = this.moveElement(this.fieldValue, fromIndex, toIndex) + + this.updateTextareaInput() + this.updateKeyValueComponent() + } + + moveElement(array, fromIndex, toIndex) { + const element = array[fromIndex] + + // remove 1 item at fromIndex + array.splice(fromIndex, 1) + + // insert element at toIndex + array.splice(toIndex, 0, element) + + return array + } + focusLastRow() { return this.rowsTarget.querySelector('.flex.key-value-row:last-child .key-value-input-key').focus() } @@ -85,26 +107,35 @@ export default class extends Controller { index++ }) this.rowsTarget.innerHTML = result + this.#initDragNDrop() window.initTippy() } + #initDragNDrop() { + const vm = this + // eslint-disable-next-line no-new + new Sortable(this.rowsTarget, { + animation: 150, + handle: '[data-control="dnd-handle"]', + onUpdate(event) { + vm.moveKey(event.oldIndex, event.newIndex) + }, + }) + } + interpolatedRow(key, value, index) { - let result = `
+ let result = '
' + + result += ` ${this.inputField('key', index, key, value)} - ${this.inputField('value', index, key, value)}` + ${this.inputField('value', index, key, value)} + ` + if (this.options.editable) { - result += `` + result += this.dndIcon(index) + result += this.deleteButton(index) } + result += '
' return result @@ -123,6 +154,36 @@ export default class extends Controller { />` } + deleteButton(index) { + return `` + } + + dndIcon(index) { + return `
+ + + +
` + } + setOptions() { let fieldOptions diff --git a/app/javascript/js/controllers/fields/tags_field_helpers.js b/app/javascript/js/controllers/fields/tags_field_helpers.js index f170acda44..8ce0ed8bac 100644 --- a/app/javascript/js/controllers/fields/tags_field_helpers.js +++ b/app/javascript/js/controllers/fields/tags_field_helpers.js @@ -5,7 +5,7 @@ export function tagTemplate(tagData) { // eslint-disable-next-line eqeqeq (item) => item.value == tagData.value, ) - const possibleLabel = possibleSuggestion + const possibleLabel = possibleSuggestion && 'label' in possibleSuggestion ? possibleSuggestion.label : tagData.value diff --git a/app/javascript/js/controllers/loading_button_controller.js b/app/javascript/js/controllers/loading_button_controller.js index 5c9de98ccc..740564b06a 100644 --- a/app/javascript/js/controllers/loading_button_controller.js +++ b/app/javascript/js/controllers/loading_button_controller.js @@ -6,7 +6,7 @@ export default class extends Controller { `; +
` static values = { confirmationMessage: String, @@ -52,6 +52,6 @@ export default class extends Controller { const { button } = this button.innerHTML = button.getAttribute('data-original-content') - button.removeAttribute('disabled'); + button.removeAttribute('disabled') } } diff --git a/app/javascript/js/controllers/modal_controller.js b/app/javascript/js/controllers/modal_controller.js index 0271a978f9..f071983aa4 100644 --- a/app/javascript/js/controllers/modal_controller.js +++ b/app/javascript/js/controllers/modal_controller.js @@ -1,9 +1,15 @@ import { Controller } from '@hotwired/stimulus' export default class extends Controller { - static targets = ['modal'] + static targets = ['modal', 'backdrop'] + + static values = { + closeModalOnBackdropClick: true, + } close() { + if (event.target === this.backdropTarget && !this.closeModalOnBackdropClickValue) return + this.modalTarget.remove() document.dispatchEvent(new Event('actions-modal:close')) diff --git a/app/javascript/js/controllers/search_controller.js b/app/javascript/js/controllers/search_controller.js index 7a8b1007bf..90fe13f075 100644 --- a/app/javascript/js/controllers/search_controller.js +++ b/app/javascript/js/controllers/search_controller.js @@ -24,6 +24,10 @@ export default class extends Controller { 'clearButton', ] + static values = { + extraParams: Object, + } + debouncedFetch = debouncePromise(fetch, this.searchDebounce) destroyMethod @@ -256,6 +260,7 @@ export default class extends Controller { ...Object.fromEntries(new URLSearchParams(window.location.search)), q: query, global: false, + ...this.extraParamsValue, } if (this.isGlobalSearch) { diff --git a/app/javascript/js/controllers/toggle_controller.js b/app/javascript/js/controllers/toggle_controller.js index 1041e783f4..eae5d53470 100644 --- a/app/javascript/js/controllers/toggle_controller.js +++ b/app/javascript/js/controllers/toggle_controller.js @@ -22,7 +22,7 @@ export default class extends Controller { if (this.hasPanelTarget) { const isInExemptionContainer = this.hasExemptionContainersValue && this.exemptionContainerTargets.some((container) => container.contains(e.target)) - if (!isInExemptionContainer) { + if (!isInExemptionContainer && !this.panelTarget.classList.contains('hidden')) { leave(this.panelTarget) } } diff --git a/app/javascript/js/controllers/trix_body_controller.js b/app/javascript/js/controllers/trix_body_controller.js new file mode 100644 index 0000000000..a63860c5b3 --- /dev/null +++ b/app/javascript/js/controllers/trix_body_controller.js @@ -0,0 +1,27 @@ +import { Controller } from '@hotwired/stimulus' + +export default class extends Controller { + static targets = ['content', 'moreContentButton', 'lessContentButton'] + + connect() { + this.checkContentHeight() + } + + checkContentHeight() { + const contentHeight = this.contentTarget.scrollHeight + + if (contentHeight > 50) { + this.moreContentButtonTarget.classList.remove('hidden') + } + } + + toggleContent() { + this.contentTarget.classList.toggle('hidden') + this.toggleButtons() + } + + toggleButtons() { + this.moreContentButtonTarget.classList.toggle('hidden') + this.lessContentButtonTarget.classList.toggle('hidden') + } +} diff --git a/app/javascript/js/custom-confirm.js b/app/javascript/js/custom-confirm.js index 9a7887fd29..5934ee4007 100644 --- a/app/javascript/js/custom-confirm.js +++ b/app/javascript/js/custom-confirm.js @@ -1,6 +1,6 @@ import { Turbo } from '@hotwired/turbo-rails' -Turbo.setConfirmMethod((message) => { +Turbo.config.forms.confirm = (message) => { const dialog = document.getElementById('turbo-confirm') dialog.querySelector('p').textContent = message dialog.showModal() @@ -16,4 +16,4 @@ Turbo.setConfirmMethod((message) => { resolve(dialog.returnValue === 'confirm') }, { once: true }) }) -}) +} diff --git a/app/views/avo/actions/show.html.erb b/app/views/avo/actions/show.html.erb index 6e37ab3c4a..c56ce68fa3 100644 --- a/app/views/avo/actions/show.html.erb +++ b/app/views/avo/actions/show.html.erb @@ -21,7 +21,7 @@ **@action.class.form_data_attributes, } do |form| %> - <%= render Avo::ModalComponent.new do |c| %> + <%= render Avo::ModalComponent.new(close_modal_on_backdrop_click: @action.close_modal_on_backdrop_click) do |c| %> <% c.with_heading do %> <%= @action.action_name %> <% end %> diff --git a/app/views/avo/associations/new.html.erb b/app/views/avo/associations/new.html.erb index a3375c00e2..1b1a20cf7a 100644 --- a/app/views/avo/associations/new.html.erb +++ b/app/views/avo/associations/new.html.erb @@ -36,8 +36,7 @@ as: :select, form: form, name: @field.name.singularize, - options: options_for_select(@options, - nil), + options: options_for_select(@options, selected: nil, disabled: t("avo.more_records_available")), include_blank: t('avo.choose_an_option'), stacked: true, classes: 'w-full' diff --git a/app/views/avo/debug/status.html.erb b/app/views/avo/debug/status.html.erb index 52d3360343..9d8d7e8a9e 100644 --- a/app/views/avo/debug/status.html.erb +++ b/app/views/avo/debug/status.html.erb @@ -62,6 +62,9 @@ (<%= time_ago_in_words license.response['fetched_at'] %> ago) <% end %>
Cache store
+
+ <%= Avo.cache_store.class %> +
@@ -82,15 +85,6 @@
- <%= render Avo::PanelComponent.new(title: "Report") do |c| %> - <% c.with_body do %> -
- - Loading... - -
- <% end %> - <% end %>
<% end %> <% end %> diff --git a/app/views/avo/partials/_navbar.html.erb b/app/views/avo/partials/_navbar.html.erb index e8b18f4100..e94860d54b 100644 --- a/app/views/avo/partials/_navbar.html.erb +++ b/app/views/avo/partials/_navbar.html.erb @@ -7,7 +7,7 @@ <%= render partial: "avo/partials/logo" %>
- <%= render Avo::Pro::GlobalSearchComponent.new rescue nil %> + <%= render Avo::Pro::GlobalSearchComponent.new(resource:) if defined?(Avo::Pro::GlobalSearchComponent) %>
<%= render partial: "avo/partials/header" %>
diff --git a/app/views/avo/partials/_panel_breadcrumbs.html.erb b/app/views/avo/partials/_panel_breadcrumbs.html.erb new file mode 100644 index 0000000000..f41fc0bda7 --- /dev/null +++ b/app/views/avo/partials/_panel_breadcrumbs.html.erb @@ -0,0 +1,3 @@ +
+ <%= render_avo_breadcrumbs(separator: svg("chevron-right", class: "inline-block h-3 stroke-current relative top-[-1px] mx-1")) %> +
diff --git a/app/views/layouts/avo/application.html.erb b/app/views/layouts/avo/application.html.erb index eeac92cebc..0319de8cdc 100644 --- a/app/views/layouts/avo/application.html.erb +++ b/app/views/layouts/avo/application.html.erb @@ -29,7 +29,7 @@
- <%= render partial: "avo/partials/navbar" %> + <%= render partial: "avo/partials/navbar", locals: { resource: @resource } %>
">