diff --git a/cypress/integration/discussions.js b/cypress/integration/discussions.js index 3c055d1923..a6e0ff9b56 100644 --- a/cypress/integration/discussions.js +++ b/cypress/integration/discussions.js @@ -57,7 +57,23 @@ context('Discussions', () => { cy.get('.discussion-on-page:visible .comment-field').should('have.value', ''); }; + const single_thread_discussion = () => { + cy.visit('/test-single-thread'); + cy.get('.discussions-sidebar').should('have.length', 0); + cy.get('.reply').should('have.length', 0); + + cy.get('.discussion-on-page .comment-field') + .type('This comment is being made on a single thread discussion.') + .should('have.value', 'This comment is being made on a single thread discussion.'); + + cy.get('.discussion-on-page .submit-discussion').click(); + cy.wait(3000); + cy.get('.discussion-on-page').children(".reply-card").eq(-1).children(".reply-text") + .should('have.text', 'This comment is being made on a single thread discussion.\n'); + }; + it('reply through modal', reply_through_modal); it('reply through comment box', reply_through_comment_box); it('cancel and clear comment box', cancel_and_clear_comment_box); + it('single thread discussion', single_thread_discussion); }); diff --git a/frappe/templates/discussions/comment_box.html b/frappe/templates/discussions/comment_box.html index cbdc3ad3e5..ab4714185a 100644 --- a/frappe/templates/discussions/comment_box.html +++ b/frappe/templates/discussions/comment_box.html @@ -1,32 +1,35 @@
-
-
-
- -
+ {% if not single_thread %} +
+
+
+
+
+ {% endif %} -
-
-
- -
+
+
+
+
+
-
-
- {{ _("Press Cmd+Enter to post your comment") }} -
- - {{ _("Cancel") }} -
- {{ _("Post") }}
+
+
+ {{ _("Press Cmd+Enter to post your comment") }}
- + + {{ _("Cancel") }} +
+ {{ _("Post") }} +
+
+ diff --git a/frappe/templates/discussions/discussions.js b/frappe/templates/discussions/discussions.js index becc50410d..19c0f89a49 100644 --- a/frappe/templates/discussions/discussions.js +++ b/frappe/templates/discussions/discussions.js @@ -87,29 +87,43 @@ const setup_socket_io = () => { }; const publish_message = (data) => { + const doctype = decodeURIComponent($(".discussions-parent").attr("data-doctype")); + const docname = decodeURIComponent($(".discussions-parent").attr("data-docname")); + const topic = data.topic_info; + const single_thread = $(".is-single-thread").length; + const first_topic = !$(".reply-card").length; + const document_match_found = doctype == topic.reference_doctype && docname == topic.reference_docname; - if ($(`.discussion-on-page[data-topic=${data.topic_info.name}]`).length) { + if ($(`.discussion-on-page[data-topic=${topic.name}]`).length) { post_message_cleanup(); - $('
' + data.template).insertBefore(`.discussion-on-page[data-topic=${data.topic_info.name}] .discussion-form`); - } else if ((decodeURIComponent($(".discussions-parent .discussions-card").attr("data-doctype")) == data.topic_info.reference_doctype - && decodeURIComponent($(".discussions-parent .discussions-card").attr("data-docname")) == data.topic_info.reference_docname)) { + data.template = style_avatar_frame(data.template); + $('
' + data.template) + .insertBefore(`.discussion-on-page[data-topic=${topic.name}] .discussion-form`); + } else if (!first_topic && !single_thread && document_match_found) { post_message_cleanup(); data.new_topic_template = style_avatar_frame(data.new_topic_template); $(data.sidebar).insertAfter(`.discussions-sidebar .form-group`); $(`#discussion-group`).prepend(data.new_topic_template); - if (data.topic_info.owner == frappe.session.user) { - $(".discussion-on-page").collapse(); + if (topic.owner == frappe.session.user) { + $(".discussion-on-page") && $(".discussion-on-page").collapse(); $(".sidebar-topic").first().click(); } - } else if (data.topic_info.owner == frappe.session.user) { + + } else if (single_thread && document_match_found) { + post_message_cleanup(); + data.template = style_avatar_frame(data.template); + $(data.template).insertBefore(`.discussion-form`); + $(".discussion-on-page").attr("data-topic", topic.name); + + } else if (topic.owner == frappe.session.user && document_match_found) { post_message_cleanup(); window.location.reload(); } - update_reply_count(data.topic_info.name); + update_reply_count(topic.name); }; const post_message_cleanup = () => { @@ -191,10 +205,10 @@ const submit_discussion = (e) => { const reply = $(".comment-field:visible").val().trim(); if (reply) { - let doctype = $(e.currentTarget).attr("data-doctype"); + let doctype = $(e.currentTarget).closest(".discussions-parent").attr("data-doctype"); doctype = doctype ? decodeURIComponent(doctype) : doctype; - let docname = $(e.currentTarget).attr("data-docname"); + let docname = $(e.currentTarget).closest(".discussions-parent").attr("data-docname"); docname = docname ? decodeURIComponent(docname) : docname; frappe.call({ @@ -232,7 +246,8 @@ const get_color_from_palette = (element) => { const style_avatar_frame = (template) => { const $template = $(template); - $template.find(".avatar-frame").css(get_color_from_palette($template.find(".avatar-frame"))); + $template.find(".avatar-frame").length + && $template.find(".avatar-frame").css(get_color_from_palette($template.find(".avatar-frame"))); return $template.prop("outerHTML"); }; diff --git a/frappe/templates/discussions/discussions_section.html b/frappe/templates/discussions/discussions_section.html index 65e1730bc7..57dc59c926 100644 --- a/frappe/templates/discussions/discussions_section.html +++ b/frappe/templates/discussions/discussions_section.html @@ -1,22 +1,26 @@ {% set topics = frappe.get_all("Discussion Topic", {"reference_doctype": doctype, "reference_docname": docname}, ["name", "title", "owner", "creation"]) %} -{% include "frappe/templates/discussions/topic_modal.html" %} -
+
+ + {% include "frappe/templates/discussions/topic_modal.html" %} +
{{ _(title) }} - {% if topics %} + {% if topics and not single_thread %} {% include "frappe/templates/discussions/button.html" %} {% endif %}
- {% if topics %} -
+
+ {% if topics and not single_thread %} +
{% include "frappe/templates/discussions/search.html" %} + {% for topic in topics %} {% set replies = frappe.get_all("Discussion Reply", {"topic": topic.name})%} {% include "frappe/templates/discussions/sidebar.html" %} @@ -24,13 +28,17 @@
+ {% for topic in topics %} {% include "frappe/templates/discussions/reply_section.html" %} + {% endfor %}
-
- {% else %} -
-
+ {% elif single_thread %} + {% set topic = topics[0] if topics | length else None %} + {% include "frappe/templates/discussions/reply_section.html" %} + + {% else %} +
No {{ title }}
There are no {{ title | lower }} for this {{ doctype | lower }}, why don't you start one!
diff --git a/frappe/templates/discussions/reply_card.html b/frappe/templates/discussions/reply_card.html index ed9baf554a..5ff5261472 100644 --- a/frappe/templates/discussions/reply_card.html +++ b/frappe/templates/discussions/reply_card.html @@ -2,10 +2,10 @@
{% set member = frappe.db.get_value("User", reply.owner, ["name", "full_name", "username"], as_dict=True) %}
- {% if loop.index == 1 %} + {% if loop.index == 1 or single_thread %} {{ avatar(reply.owner) }} {% endif %} - + {{ member.full_name }}
{{ frappe.utils.pretty_date(reply.creation) }}
diff --git a/frappe/templates/discussions/reply_section.html b/frappe/templates/discussions/reply_section.html index e2f86da5f9..c0be40ab01 100644 --- a/frappe/templates/discussions/reply_section.html +++ b/frappe/templates/discussions/reply_section.html @@ -1,16 +1,23 @@ -{% for topic in topics %} +{% if topic %} + {% set replies = frappe.get_all("Discussion Reply", {"topic": topic.name}, ["reply", "owner", "creation"], order_by="creation")%} -{% if replies %} -
+{% endif %} +
+ + {% if not single_thread %}
{{ _("Back") }}
+ {% endif %} + {% if topic and topic.title %}
{{ topic.title }}
+ {% endif %} + {% for reply in replies %} {% include "frappe/templates/discussions/reply_card.html" %} @@ -34,5 +41,3 @@ {% endif %}
-{% endif %} -{% endfor %} diff --git a/frappe/templates/styles/discussion_style.css b/frappe/templates/styles/discussion_style.css index 7aa6a02d5a..fc9db68aca 100644 --- a/frappe/templates/styles/discussion_style.css +++ b/frappe/templates/styles/discussion_style.css @@ -3,7 +3,7 @@ padding: 1rem; } -.discussions-parent .form-control { +.thread-card .form-control { background-color: #FFFFFF; font-size: inherit; color: inherit; @@ -246,6 +246,6 @@ } .card-divider-dark { - border: 1px solid var(--gray-400); - margin-bottom: 16px; + border: 1px solid var(--gray-300); + margin-bottom: 1rem; } diff --git a/frappe/tests/ui_test_helpers.py b/frappe/tests/ui_test_helpers.py index 82dfe618c7..3e9b3519bc 100644 --- a/frappe/tests/ui_test_helpers.py +++ b/frappe/tests/ui_test_helpers.py @@ -194,16 +194,17 @@ def create_form_tour(): @frappe.whitelist() def create_data_for_discussions(): - web_page = create_web_page() + web_page = create_web_page("Test page for discussions", "test-page-discussions", False) create_topic_and_reply(web_page) + create_web_page("Test single thread discussion", "test-single-thread", True) -def create_web_page(): - web_page = frappe.db.exists("Web Page", {"route": "test-page-discussions"}) +def create_web_page(title, route, single_thread): + web_page = frappe.db.exists("Web Page", {"route": route}) if not web_page: web_page = frappe.get_doc({ "doctype": "Web Page", - "title": "Test page for discussions", - "route": "test-page-discussions", + "title": title, + "route": route, "published": True }) web_page.save() @@ -213,7 +214,8 @@ def create_web_page(): "web_template_values": frappe.as_json({ "title": "Discussions", "cta_title": "New Discussion", - "docname": web_page.name + "docname": web_page.name, + "single_thread": single_thread }) }) web_page.save() diff --git a/frappe/website/doctype/discussion_reply/discussion_reply.py b/frappe/website/doctype/discussion_reply/discussion_reply.py index 82e379c7d4..d5913e6f29 100644 --- a/frappe/website/doctype/discussion_reply/discussion_reply.py +++ b/frappe/website/doctype/discussion_reply/discussion_reply.py @@ -8,6 +8,10 @@ class DiscussionReply(Document): def after_insert(self): replies = frappe.db.count("Discussion Reply", {"topic": self.topic}) + topic_info = frappe.get_all("Discussion Topic", + {"name": self.topic}, + ["reference_doctype", "reference_docname", "name", "title", "owner", "creation"]) + template = frappe.render_template("frappe/templates/discussions/reply_card.html", { "reply": self, "topic": { @@ -15,19 +19,16 @@ class DiscussionReply(Document): }, "loop": { "index": replies - } + }, + "single_thread": True if not topic_info[0].title else False }) - topic_info = frappe.get_all("Discussion Topic", - {"name": self.topic}, - ["reference_doctype", "reference_docname", "name", "title", "owner", "creation"]) - sidebar = frappe.render_template("frappe/templates/discussions/sidebar.html", { "topic": topic_info[0] }) new_topic_template = frappe.render_template("frappe/templates/discussions/reply_section.html", { - "topics": topic_info + "topic": topic_info[0] }) frappe.publish_realtime( diff --git a/frappe/website/web_template/discussions/discussions.json b/frappe/website/web_template/discussions/discussions.json index 8856787828..c8c90e08aa 100644 --- a/frappe/website/web_template/discussions/discussions.json +++ b/frappe/website/web_template/discussions/discussions.json @@ -22,10 +22,17 @@ "label": "Web Page", "options": "Web Page", "reqd": 1 + }, + { + "__unsaved": 1, + "fieldname": "single_thread", + "fieldtype": "Check", + "label": "Single Thread", + "reqd": 0 } ], "idx": 0, - "modified": "2021-10-01 12:15:28.876920", + "modified": "2021-10-01 15:15:57.366552", "modified_by": "Administrator", "module": "Website", "name": "Discussions", @@ -33,4 +40,4 @@ "standard": 1, "template": "", "type": "Section" -} +} \ No newline at end of file