A platform for community discussion. Free, open, simple.
FIX: Persist group default tag notification settings (#39369)
Régis Hanol84ac1b295a66
diff --git a/app/models/tag_user.rb b/app/models/tag_user.rbindex ac0843d1316..99e7636bcc8 100644--- a/app/models/tag_user.rb+++ b/app/models/tag_user.rb@@ -216,18 +216,22 @@ class TagUser < ActiveRecord::Basemuted_tag_names = SiteSetting.default_tags_muted.split("|")- tag_data = Tag.where(name: default_tag_names + muted_tag_names).pluck(:name, :id).to_h+ tag_data =+ Tag+ .where(name: default_tag_names + muted_tag_names)+ .pluck(:name, :id, :slug)+ .to_h { |name, id, slug| [name, [id, slug]] }notification_levels =default_tag_names.filter_map do |name|- id = tag_data[name]- [id, { level: self.notification_levels[:regular], name: }] if id+ id, slug = tag_data[name]+ [id, { level: self.notification_levels[:regular], name:, slug: }] if idendnotification_levels +=muted_tag_names.filter_map do |name|- id = tag_data[name]- [id, { level: self.notification_levels[:muted], name: }] if id+ id, slug = tag_data[name]+ [id, { level: self.notification_levels[:muted], name:, slug: }] if idendelsenotification_levels =@@ -235,8 +239,8 @@ class TagUser < ActiveRecord::Base.notification_level_visible.where(user:).joins(:tag)- .pluck("tags.id", "tags.name", :notification_level)- .map { |id, name, level| [id, { level:, name: }] }+ .pluck("tags.id", "tags.name", "tags.slug", :notification_level)+ .map { |id, name, slug, level| [id, { level:, name:, slug: }] }endnotification_levels.to_hdiff --git a/app/serializers/concerns/user_tag_notifications_mixin.rb b/app/serializers/concerns/user_tag_notifications_mixin.rbindex 76978a32ed0..82bb0f79f7b 100644--- a/app/serializers/concerns/user_tag_notifications_mixin.rb+++ b/app/serializers/concerns/user_tag_notifications_mixin.rb@@ -23,7 +23,9 @@ module UserTagNotificationsMixindef tags_with_notification_level(lookup_level)tag_user_notification_levels.filter_map do |id, data|- { id:, name: data[:name] } if data[:level] == TagUser.notification_levels[lookup_level]+ if data[:level] == TagUser.notification_levels[lookup_level]+ { id:, name: data[:name], slug: data[:slug] }+ endendenddiff --git a/app/serializers/group_show_serializer.rb b/app/serializers/group_show_serializer.rbindex 278722e7f61..315bd16635c 100644--- a/app/serializers/group_show_serializer.rb+++ b/app/serializers/group_show_serializer.rb@@ -150,10 +150,10 @@ class GroupShowSerializer < BasicGroupSerializerGroupTagNotificationDefault.where(group_id: object.id).joins(:tag)- .pluck(:notification_level, :name)- .inject({}) do |h, arr|- h[arr[0]] ||= []- h[arr[0]] << arr[1]+ .pluck(:notification_level, "tags.id", "tags.name", "tags.slug")+ .inject({}) do |h, (level, id, name, slug)|+ h[level] ||= []+ h[level] << { id:, name:, slug: }hendenddiff --git a/frontend/discourse/app/models/group.js b/frontend/discourse/app/models/group.jsindex 1c95c722f12..190b6157e53 100644--- a/frontend/discourse/app/models/group.js+++ b/frontend/discourse/app/models/group.js@@ -380,7 +380,10 @@ export default class Group extends RestModel {let tags = this.get(s + "_tags");if (tags) {- attrs[s + "_tags"] = tags.length > 0 ? tags : [""];+ attrs[s + "_tags"] =+ tags.length > 0+ ? tags.map((t) => (typeof t === "object" ? t.name : t))+ : [""];}});diff --git a/frontend/discourse/tests/unit/models/group-test.js b/frontend/discourse/tests/unit/models/group-test.jsindex fa25e016107..d9bcc272d13 100644--- a/frontend/discourse/tests/unit/models/group-test.js+++ b/frontend/discourse/tests/unit/models/group-test.js@@ -26,4 +26,22 @@ module("Unit | Model | group", function (hooks) {"it should return the group's name");});++ test("asJSON extracts tag names when tags are objects", function (assert) {+ const store = getOwner(this).lookup("service:store");+ const group = store.createRecord("group", { name: "test" });++ group.set("watching_tags", [+ { id: 1, name: "art", slug: "art" },+ { id: 2, name: "music", slug: "music" },+ ]);+ group.set("tracking_tags", ["books"]);+ group.set("muted_tags", []);++ const json = group.asJSON();++ assert.deepEqual(json.watching_tags, ["art", "music"]);+ assert.deepEqual(json.tracking_tags, ["books"]);+ assert.deepEqual(json.muted_tags, [""]);+ });});diff --git a/spec/requests/tags_controller_spec.rb b/spec/requests/tags_controller_spec.rbindex 5ca7ffefa85..95843b1039d 100644--- a/spec/requests/tags_controller_spec.rb+++ b/spec/requests/tags_controller_spec.rb@@ -2189,7 +2189,9 @@ RSpec.describe TagsController doexpect(response.status).to eq(200)expect(response.parsed_body["watched_tags"]).to eq([])expect(response.parsed_body["watching_first_post_tags"]).to eq([])- expect(response.parsed_body["tracked_tags"]).to eq([{ "id" => tag.id, "name" => tag.name }])+ expect(response.parsed_body["tracked_tags"]).to eq(+ [{ "id" => tag.id, "name" => tag.name, "slug" => tag.slug }],+ )expect(response.parsed_body["muted_tags"]).to eq([])expect(response.parsed_body["regular_tags"]).to eq([])@@ -2210,7 +2212,9 @@ RSpec.describe TagsController doexpect(response.parsed_body["watched_tags"]).to eq([])expect(response.parsed_body["watching_first_post_tags"]).to eq([])expect(response.parsed_body["tracked_tags"]).to eq([])- expect(response.parsed_body["muted_tags"]).to eq([{ "id" => tag.id, "name" => tag.name }])+ expect(response.parsed_body["muted_tags"]).to eq(+ [{ "id" => tag.id, "name" => tag.name, "slug" => tag.name }],+ )expect(response.parsed_body["regular_tags"]).to eq([])end.to change { user.tag_users.count }.by(1)diff --git a/spec/serializers/current_user_serializer_spec.rb b/spec/serializers/current_user_serializer_spec.rbindex 8e6b5df5519..6179e5e0c64 100644--- a/spec/serializers/current_user_serializer_spec.rb+++ b/spec/serializers/current_user_serializer_spec.rb@@ -77,7 +77,7 @@ RSpec.describe CurrentUserSerializer doit "includes muted tags" dopayload = serializer.as_json- expect(payload[:muted_tags]).to eq([{ id: tag.id, name: tag.name }])+ expect(payload[:muted_tags]).to eq([{ id: tag.id, name: tag.name, slug: tag.slug }])endenddiff --git a/spec/serializers/group_show_serializer_spec.rb b/spec/serializers/group_show_serializer_spec.rbindex 71166a17b56..ce670176366 100644--- a/spec/serializers/group_show_serializer_spec.rb+++ b/spec/serializers/group_show_serializer_spec.rb@@ -137,8 +137,12 @@ RSpec.describe GroupShowSerializer doexpect(serializer.as_json[:regular_category_ids]).to eq([])expect(serializer.as_json[:muted_category_ids]).to eq([])- expect(serializer.as_json[:watching_tags]).to eq([tag1.name])- expect(serializer.as_json[:tracking_tags]).to eq([tag2.name])+ expect(serializer.as_json[:watching_tags]).to eq(+ [{ id: tag1.id, name: tag1.name, slug: tag1.slug }],+ )+ expect(serializer.as_json[:tracking_tags]).to eq(+ [{ id: tag2.id, name: tag2.name, slug: tag2.slug }],+ )expect(serializer.as_json[:watching_first_post_tags]).to eq([])expect(serializer.as_json[:regular_tags]).to eq([])expect(serializer.as_json[:muted_tags]).to eq([])diff --git a/spec/serializers/user_serializer_spec.rb b/spec/serializers/user_serializer_spec.rbindex 768c5208261..7df151daf99 100644--- a/spec/serializers/user_serializer_spec.rb+++ b/spec/serializers/user_serializer_spec.rb@@ -173,10 +173,12 @@ RSpec.describe UserSerializer donotification_level: TagUser.notification_levels[:watching_first_post],)- expect(json[:muted_tags]).to eq([{ id: tag1.id, name: tag1.name }])- expect(json[:tracked_tags]).to eq([{ id: tag2.id, name: tag2.name }])- expect(json[:watched_tags]).to eq([{ id: tag3.id, name: tag3.name }])- expect(json[:watching_first_post_tags]).to eq([{ id: tag4.id, name: tag4.name }])+ expect(json[:muted_tags]).to eq([{ id: tag1.id, name: tag1.name, slug: tag1.slug }])+ expect(json[:tracked_tags]).to eq([{ id: tag2.id, name: tag2.name, slug: tag2.slug }])+ expect(json[:watched_tags]).to eq([{ id: tag3.id, name: tag3.name, slug: tag3.slug }])+ expect(json[:watching_first_post_tags]).to eq(+ [{ id: tag4.id, name: tag4.name, slug: tag4.slug }],+ )endend