A platform for community discussion. Free, open, simple.
FIX: Allow draft to be opened for nested view topics (#39621)
Mark VanLandinghameff2d9847f27
diff --git a/app/controllers/nested_topics_controller.rb b/app/controllers/nested_topics_controller.rbindex d4c0c28b3e1..fdf95a66415 100644--- a/app/controllers/nested_topics_controller.rb+++ b/app/controllers/nested_topics_controller.rb@@ -157,6 +157,10 @@ class NestedTopicsController < ApplicationControllerTopicView.new(topic_id, current_user, skip_custom_fields: true, skip_post_loading: true)@topic = @topic_view.topicguardian.ensure_can_see!(@topic)++ if should_track_visit?+ @topic_view.draft = Draft.get(current_user, @topic_view.draft_key, @topic_view.draft_sequence)+ endrescue Discourse::InvalidAccessraise Discourse::NotFoundenddiff --git a/frontend/discourse/app/routes/nested.js b/frontend/discourse/app/routes/nested.jsindex 4ec1774485f..bfb8c38dabc 100644--- a/frontend/discourse/app/routes/nested.js+++ b/frontend/discourse/app/routes/nested.js@@ -1,11 +1,15 @@import { getOwner } from "@ember/owner";import Route from "@ember/routing/route";import { service } from "@ember/service";+import { isEmpty } from "@ember/utils";import { ajax } from "discourse/lib/ajax";+import EmbedMode from "discourse/lib/embed-mode";import PreloadStore from "discourse/lib/preload-store";+import Draft from "discourse/models/draft";import processNode from "../lib/process-node";export default class NestedRoute extends Route {+ @service composer;@service nestedViewCache;@service screenTrack;@service site;@@ -100,6 +104,16 @@ export default class NestedRoute extends Route {}this.screenTrack.start(model.topic.id, controller);++ if (!isEmpty(model.topic.draft) && !EmbedMode.enabled) {+ this.composer.open({+ draft: Draft.getLocal(model.topic.draft_key, model.topic.draft),+ draftKey: model.topic.draft_key,+ draftSequence: model.topic.draft_sequence,+ ignoreIfChanged: true,+ topic: model.topic,+ });+ }}deactivate() {diff --git a/spec/system/nested_resume_draft_spec.rb b/spec/system/nested_resume_draft_spec.rbnew file mode 100644index 00000000000..a12429609e8--- /dev/null+++ b/spec/system/nested_resume_draft_spec.rb@@ -0,0 +1,33 @@+# frozen_string_literal: true++RSpec.describe "Nested view resuming a draft from the user activity page" do+ fab!(:user) { Fabricate(:user, refresh_auto_groups: true) }+ fab!(:topic) { Fabricate(:topic, user: user) }+ fab!(:op) { Fabricate(:post, topic: topic, user: user, post_number: 1) }++ let(:drafts_page) { PageObjects::Pages::UserActivityDrafts.new }+ let(:nested_view) { PageObjects::Pages::NestedView.new }+ let(:composer) { PageObjects::Components::Composer.new }++ before do+ SiteSetting.nested_replies_enabled = true+ Fabricate(:nested_topic, topic: topic)+ Draft.set(+ user,+ "#{Draft::EXISTING_TOPIC}#{topic.id}",+ 0,+ { reply: "Resumed nested draft body", action: "reply" }.to_json,+ )+ sign_in(user)+ end++ it "opens the composer with the draft body when resuming a nested topic draft" do+ drafts_page.visit(user)+ page.find(".resume-draft").click++ expect(page).to have_current_path(%r{/n/})+ expect(nested_view).to have_nested_view+ expect(composer).to be_opened+ expect(composer).to have_content("Resumed nested draft body")+ end+end