Fix side_comment discussion type

refs VICE-4538
flag=discussion_create

test plan:
1.turn off the discussion_create feature flag
2.create a discussion with a comment
3.create threaded replies
4.turn on discussion_create feature flag
5.verify that the discussion's discussion type is threaded
6.verify that on the edit page the Disallow threaded discussions
checkbox is disabled

Change-Id: Ic03a753e32bc94defa512b1b554e55eb8f8b000f
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/354113
Reviewed-by: Roland Beres <roland.beres@instructure.com>
QA-Review: Roland Beres <roland.beres@instructure.com>
Product-Review: Kyle Rosenbaum <krosenbaum@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>

app/models/discussion_topic.rb

@@ -219,7 +219,7 @@ class DiscussionTopic < ActiveRecord::Base
   end
 
   def threaded?
-    discussion_type == DiscussionTypes::THREADED || (root_account&.feature_enabled?(:discussion_checkpoints) && checkpoints?)
+    discussion_type == DiscussionTypes::THREADED || (root_account&.feature_enabled?(:discussion_checkpoints) && checkpoints?) || (DiscussionTypes::SIDE_COMMENT && discussion_entries.where.not(parent_id: nil).where.not(workflow_state: "deleted").exists?)
   end
   alias_method :threaded, :threaded?
 

spec/models/discussion_entry_spec.rb

@@ -596,18 +596,7 @@ describe DiscussionEntry do
       course_with_teacher
     end
 
-    it "forces a root entry as parent if the discussion isn't threaded" do
+    it "allows a sub-entry as parent" do
-      discussion_topic_model
-      root = @topic.reply_from(user: @teacher, text: "root entry")
-      sub1 = root.reply_from(user: @teacher, html: "sub entry")
-      expect(sub1.parent_entry).to eq root
-      expect(sub1.root_entry).to eq root
-      sub2 = sub1.reply_from(user: @teacher, html: "sub-sub entry")
-      expect(sub2.parent_entry).to eq root
-      expect(sub2.root_entry).to eq root
-    end
-
-    it "allows a sub-entry as parent if the discussion is threaded" do
       discussion_topic_model(threaded: true)
       root = @topic.reply_from(user: @teacher, text: "root entry")
       sub1 = root.reply_from(user: @teacher, html: "sub entry")

spec/models/discussion_topic_spec.rb

@@ -250,6 +250,21 @@ describe DiscussionTopic do
     expect(@course.discussion_topics.first.message).to eql("<a href=\"#\">only this should stay</a>")
   end
 
+  it "side-comment discussion type is threaded when it has threaded replies" do
+    topic = @course.discussion_topics.create!(message: "test")
+    topic.discussion_type = "side_comment"
+    entry = topic.discussion_entries.create!(message: "test")
+    entry.reply_from(user: @student, html: "reply 1")
+    expect(topic.threaded?).to be true
+  end
+
+  it "side-comment discussion type is not threaded when it does not have threaded replies" do
+    topic = @course.discussion_topics.create!(message: "test")
+    topic.discussion_type = "side_comment"
+    topic.discussion_entries.create!(message: "test")
+    expect(topic.threaded?).to be false
+  end
+
   it "defaults to not_threaded type" do
     d = DiscussionTopic.new
     expect(d.discussion_type).to eq "not_threaded"

ui/features/discussion_topic_edit_v2/react/components/DiscussionTopicForm/DiscussionTopicForm.jsx

@@ -190,7 +190,7 @@ function DiscussionTopicForm({
     currentDiscussionTopic?.isAnonymousAuthor || true
   )
   const [isThreaded, setIsThreaded] = useState(
-    currentDiscussionTopic?.discussionType === "threaded" || Object.keys(currentDiscussionTopic).length === 0
+    currentDiscussionTopic?.discussionType === "threaded" || (currentDiscussionTopic?.discussionType === "side_comment" && ENV?.DISCUSSION_TOPIC?.ATTRIBUTES?.has_threaded_replies) || Object.keys(currentDiscussionTopic).length === 0
   )
   const [requireInitialPost, setRequireInitialPost] = useState(
     currentDiscussionTopic?.requireInitialPost || false

ui/features/discussion_topic_edit_v2/react/components/DiscussionTopicForm/__tests__/DiscussionTopicForm.test.jsx

@@ -505,6 +505,25 @@ describe('DiscussionTopicForm', () => {
     })
   })
 
+  describe('Disallow threaded replies', () => {
+    it('disallow threaded replies checkbox is checked when discussion type is side comment and does not has threaded reply', () => {
+      window.ENV.DISCUSSION_TOPIC.ATTRIBUTES.has_threaded_replies = false
+      const {getByTestId} = setup({currentDiscussionTopic: {discussionType: "side_comment"}})
+
+      const checkbox = getByTestId('disallow_threaded_replies')
+      expect(checkbox.checked).toBe(true)
+    })
+
+    it('disallow threaded replies checkbox is disabled when discussion type is side comment and has threaded replies', () => {
+      window.ENV.DISCUSSION_TOPIC.ATTRIBUTES.has_threaded_replies = true
+      const {getByTestId} = setup({currentDiscussionTopic: {discussionType: "side_comment"}})
+
+      const checkbox = getByTestId('disallow_threaded_replies')
+      expect(checkbox.disabled).toBe(true)
+      expect(checkbox.checked).toBe(false)
+    })
+  })
+
   describe('Graded', () => {
     it('does not allow the automatic peer review per student input to go below 1', () => {
       const {getByTestId, getByLabelText} = setup()