A platform for community discussion. Free, open, simple.
UX: don't include OP in "me too" shared issue counter (#40129)
Kris91282252cd7f
diff --git a/plugins/discourse-solved/app/models/discourse_solved/shared_issue.rb b/plugins/discourse-solved/app/models/discourse_solved/shared_issue.rbindex 6186758c20d..b903f365f35 100644--- a/plugins/discourse-solved/app/models/discourse_solved/shared_issue.rb+++ b/plugins/discourse-solved/app/models/discourse_solved/shared_issue.rb@@ -11,7 +11,7 @@ module DiscourseSolvedvalidates :user_id, presence: truedef self.count_for(topic)- where(topic: topic).count + 1 # topic author is implicitly counted+ where(topic: topic).countendendenddiff --git a/plugins/discourse-solved/assets/javascripts/discourse/components/solved-shared-issue-button.gjs b/plugins/discourse-solved/assets/javascripts/discourse/components/solved-shared-issue-button.gjsindex dba79ffb5f2..0c0fa38183f 100644--- a/plugins/discourse-solved/assets/javascripts/discourse/components/solved-shared-issue-button.gjs+++ b/plugins/discourse-solved/assets/javascripts/discourse/components/solved-shared-issue-button.gjs@@ -22,7 +22,7 @@ export default class SolvedSharedIssueButton extends Component {}get count() {- return this.args.post.topic.shared_issue_count ?? 1;+ return this.args.post.topic.shared_issue_count ?? 0;}get hasSharedIssue() {@@ -38,6 +38,9 @@ export default class SolvedSharedIssueButton extends Component {}get label() {+ if (this.count === 0) {+ return i18n("solved.shared_issue.label_zero");+ }return i18n("solved.shared_issue.label", { count: this.count });}diff --git a/plugins/discourse-solved/config/locales/client.en.yml b/plugins/discourse-solved/config/locales/client.en.ymlindex cc5d0132749..db4758aeb54 100644--- a/plugins/discourse-solved/config/locales/client.en.yml+++ b/plugins/discourse-solved/config/locales/client.en.yml@@ -60,6 +60,7 @@ en:confirm_solved_removal_cancel: "Cancel"shared_issue:+ label_zero: "Me too"label:one: "Me too (%{count})"other: "Me too (%{count})"diff --git a/plugins/discourse-solved/spec/requests/discourse_solved/shared_issue_controller_spec.rb b/plugins/discourse-solved/spec/requests/discourse_solved/shared_issue_controller_spec.rbindex 6e2b674b063..d6e8b7aa373 100644--- a/plugins/discourse-solved/spec/requests/discourse_solved/shared_issue_controller_spec.rb+++ b/plugins/discourse-solved/spec/requests/discourse_solved/shared_issue_controller_spec.rb@@ -32,7 +32,7 @@ RSpec.describe DiscourseSolved::SharedIssueController do}.by(1)expect(response.status).to eq(200)body = response.parsed_body- expect(body["count"]).to eq(2)+ expect(body["count"]).to eq(1)expect(body["user_created_shared_issue"]).to eq(true)enddiff --git a/plugins/discourse-solved/spec/services/discourse_solved/shared_issue/toggle_spec.rb b/plugins/discourse-solved/spec/services/discourse_solved/shared_issue/toggle_spec.rbindex 6da2450330d..83536874616 100644--- a/plugins/discourse-solved/spec/services/discourse_solved/shared_issue/toggle_spec.rb+++ b/plugins/discourse-solved/spec/services/discourse_solved/shared_issue/toggle_spec.rb@@ -136,7 +136,7 @@ RSpec.describe DiscourseSolved::SharedIssue::Toggle doit "publishes a shared issue message indicating the user created a shared issue" doexpect(messages).to include(an_object_having_attributes(- data: a_hash_including(type: :shared_issue, count: 2, user_created_shared_issue: true),+ data: a_hash_including(type: :shared_issue, count: 1, user_created_shared_issue: true),),)end@@ -172,7 +172,7 @@ RSpec.describe DiscourseSolved::SharedIssue::Toggle doit "publishes a shared issue message indicating the user withdrew their shared issue" doexpect(messages).to include(an_object_having_attributes(- data: a_hash_including(type: :shared_issue, count: 1, user_created_shared_issue: false),+ data: a_hash_including(type: :shared_issue, count: 0, user_created_shared_issue: false),),)enddiff --git a/plugins/discourse-solved/spec/system/page_objects/components/post_shared_issue_button.rb b/plugins/discourse-solved/spec/system/page_objects/components/post_shared_issue_button.rbindex 5bbcf7b8855..4b27f2320d7 100644--- a/plugins/discourse-solved/spec/system/page_objects/components/post_shared_issue_button.rb+++ b/plugins/discourse-solved/spec/system/page_objects/components/post_shared_issue_button.rb@@ -31,7 +31,8 @@ module PageObjectsenddef has_count?(count)- within_post { has_css?(SELECTOR, text: "Me too (#{count})") }+ label = count.zero? ? "Me too" : "Me too (#{count})"+ within_post { has_css?(SELECTOR, exact_text: label) }endprivatediff --git a/plugins/discourse-solved/spec/system/shared_issue_spec.rb b/plugins/discourse-solved/spec/system/shared_issue_spec.rbindex 4a2b9c3223b..e798aa1c90f 100644--- a/plugins/discourse-solved/spec/system/shared_issue_spec.rb+++ b/plugins/discourse-solved/spec/system/shared_issue_spec.rb@@ -31,10 +31,10 @@ describe "Solved | Shared issue button" dotopic_page.visit_topic(topic)expect(shared_issue_button).to have_shared_issue_button- expect(shared_issue_button).to have_count(1)+ expect(shared_issue_button).to have_count(0)shared_issue_button.click- expect(shared_issue_button).to have_count(2)+ expect(shared_issue_button).to have_count(1)expect(shared_issue_button).to have_activeexpect(TopicUser.get(topic, member).notification_level).to eq(@@ -42,7 +42,7 @@ describe "Solved | Shared issue button" do)shared_issue_button.click- expect(shared_issue_button).to have_count(1)+ expect(shared_issue_button).to have_count(0)expect(shared_issue_button).to have_no_css(".has-shared-issue")end@@ -108,6 +108,6 @@ describe "Solved | Shared issue button" doexpect(shared_issue_button).to have_shared_issue_buttonexpect(shared_issue_button).to have_read_only- expect(shared_issue_button).to have_count(1)+ expect(shared_issue_button).to have_count(0)endend