From 49446ea87901e2246bebe398d4d6b22eeeb265f0 Mon Sep 17 00:00:00 2001 From: Paul Bob <69730720+Paul-Bob@users.noreply.github.com> Date: Thu, 6 Feb 2025 14:28:26 +0200 Subject: [PATCH 1/2] chore: revert media library anchor_string (#3642) --- app/components/avo/media_library/list_component.html.erb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/components/avo/media_library/list_component.html.erb b/app/components/avo/media_library/list_component.html.erb index e10abcbfa8..c410dd4453 100644 --- a/app/components/avo/media_library/list_component.html.erb +++ b/app/components/avo/media_library/list_component.html.erb @@ -51,7 +51,10 @@
<%== helpers.pagy_info @pagy %>
<% if @pagy.pages > 1 %> - <%== helpers.pagy_nav(@pagy, anchor_string: "data-turbo-frame=\"#{@turbo_frame}\"") %> + <%# xanchor_string is not valid key word argument and it breaks when require "pagy/extras/calendar" %> + <%# https://github.com/ddnexus/pagy/blob/d70e443872a5b18da4e482454b3c8b4a1c86cb6b/gem/lib/pagy/extras/calendar.rb#L47 %> + <%#== helpers.pagy_nav(@pagy, xanchor_string: "data-turbo-frame=\"#{@turbo_frame}\"") %> + <%== helpers.pagy_nav(@pagy) %> <% end %>
From f8064297aa54a5c1df1d579545265977fedb3ac1 Mon Sep 17 00:00:00 2001 From: Paul Bob <69730720+Paul-Bob@users.noreply.github.com> Date: Thu, 6 Feb 2025 18:24:27 +0200 Subject: [PATCH 2/2] fix: global search warning (#3643) --- app/controllers/avo/search_controller.rb | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/app/controllers/avo/search_controller.rb b/app/controllers/avo/search_controller.rb index 1aa2840506..c358bac8c0 100644 --- a/app/controllers/avo/search_controller.rb +++ b/app/controllers/avo/search_controller.rb @@ -54,7 +54,9 @@ def search_resource(resource) return nil unless render_error? search_query_undefined = error_payload( - _label: "Please configure the search for #{resource}", + header: "⚠️ Warning ⚠️", + help: "", + _label: "Search is disabled for #{resource}.\n To enable it please use this guide...", _url: "https://docs.avohq.io/3.0/search.html#enable-search-for-a-resource" ) @@ -207,10 +209,15 @@ def render_error(...) }, status: 500 end - def error_payload(_label:, _url: "") + def error_payload( + _label:, + _url: "", + header: "🚨 An error occurred during search 🚨", + help: "Please review and resolve the issue before deployment 🚨" + ) { - header: "🚨 An error occurred during search 🚨", - help: "Please review and resolve the issue before deployment 🚨", + header:, + help:, results: { _label:, _url:,