A platform for community discussion. Free, open, simple.
FIX: Apply embed mode to nested replies view (#40132)
Rafael dos Santos Silva3244438831f9
diff --git a/app/assets/stylesheets/common/base/embed-mode.scss b/app/assets/stylesheets/common/base/embed-mode.scssindex 8e4f08f8ebe..d538217426d 100644--- a/app/assets/stylesheets/common/base/embed-mode.scss+++ b/app/assets/stylesheets/common/base/embed-mode.scss@@ -19,6 +19,8 @@ body.embed-mode {.suggested-topics,.more-topics__container,#topic-title,+ .nested-view__header,+ .nested-view__topic-map,.topic-above-footer-buttons-outlet.presence,.above-main-container-outlet,.topic-footer-main-buttons__actions .toggle-admin-menu,@@ -165,7 +167,8 @@ body.embed-mode {// Hide OP// Use visibility hidden to prevent issues with jumpy behavior- .post-stream .topic-post.topic-owner:first-child {+ .post-stream .topic-post.topic-owner:first-child,+ .nested-view__op {opacity: 0;height: 0;visibility: hidden;@@ -173,6 +176,13 @@ body.embed-mode {pointer-events: none;}+ // Drop the nested-view's outer framing so it sits flush in the iframe+ .nested-view {+ padding: 0;+ background: transparent;+ border-radius: 0;+ }+.embed-mode-composer {position: sticky;bottom: 0;diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rbindex 74cb861770c..4207af192fe 100644--- a/app/controllers/topics_controller.rb+++ b/app/controllers/topics_controller.rb@@ -185,9 +185,10 @@ class TopicsController < ApplicationController!@topic_view.topic.private_message? &&(@topic_view.topic.nested_topic.present? || SiteSetting.nested_replies_default) &¶ms[:flat] != "1"- url = "/n/#{@topic_view.topic.slug}/#{@topic_view.topic.id}"+ url = +"/n/#{@topic_view.topic.slug}/#{@topic_view.topic.id}"post_number = opts[:post_number].to_iurl << "/#{post_number}" if post_number > 0+ url << "?embed_mode=true" if params[:embed_mode] == "true"redirect_to url, status: :foundreturnenddiff --git a/spec/requests/topics_controller_spec.rb b/spec/requests/topics_controller_spec.rbindex de4065ade83..a0eeec0a11f 100644--- a/spec/requests/topics_controller_spec.rb+++ b/spec/requests/topics_controller_spec.rb@@ -3063,6 +3063,15 @@ RSpec.describe TopicsController doexpect(response).not_to redirect_to("/n/#{pm.slug}/#{pm.id}")end+ it "preserves embed_mode when redirecting to nested view" do+ SiteSetting.nested_replies_enabled = true+ SiteSetting.nested_replies_default = true++ get "/t/#{topic.slug}/#{topic.id}", params: { embed_mode: "true" }++ expect(response).to redirect_to("/n/#{topic.slug}/#{topic.id}?embed_mode=true")+ end+it "returns 404 when an invalid slug is given and no id" doget "/t/nope-nope.json"