mirror of
https://github.com/discourse/discourse.git
synced 2024-11-22 12:57:29 +08:00
FEATURE: Log tag group changes in staff action log (#28787)
* FEATURE: Log tag group changes in staff action log This commit records every change (add, change, delete) to a tag group in the staff action log. It uses a modal that was originally called ThemeChangeModal to display changes, allowing staffs to see the specific changes clearly. The modal is renamed to StaffActionLogChangeModal in this PR. ref: https://meta.discourse.org/t/-/325011/14 Co-authored-by: Keegan George <kgeorge13@gmail.com>
This commit is contained in:
parent
2bb740cb16
commit
aab2987438
|
@ -3,7 +3,7 @@ import { tracked } from "@glimmer/tracking";
|
||||||
import { action } from "@ember/object";
|
import { action } from "@ember/object";
|
||||||
import { ajax } from "discourse/lib/ajax";
|
import { ajax } from "discourse/lib/ajax";
|
||||||
|
|
||||||
export default class AdminThemeChangeComponent extends Component {
|
export default class AdminStaffActionLogComponent extends Component {
|
||||||
@tracked diff;
|
@tracked diff;
|
||||||
|
|
||||||
constructor() {
|
constructor() {
|
|
@ -6,8 +6,8 @@ import { exportEntity } from "discourse/lib/export-csv";
|
||||||
import { outputExportResult } from "discourse/lib/export-result";
|
import { outputExportResult } from "discourse/lib/export-result";
|
||||||
import discourseComputed from "discourse-common/utils/decorators";
|
import discourseComputed from "discourse-common/utils/decorators";
|
||||||
import I18n from "discourse-i18n";
|
import I18n from "discourse-i18n";
|
||||||
|
import AdminStaffActionLogComponent from "../components/modal/staff-action-log-change";
|
||||||
import StaffActionLogDetailsModal from "../components/modal/staff-action-log-details";
|
import StaffActionLogDetailsModal from "../components/modal/staff-action-log-details";
|
||||||
import ThemeChangeModal from "../components/modal/theme-change";
|
|
||||||
|
|
||||||
export default class AdminLogsStaffActionLogsController extends Controller {
|
export default class AdminLogsStaffActionLogsController extends Controller {
|
||||||
@service modal;
|
@service modal;
|
||||||
|
@ -164,6 +164,8 @@ export default class AdminLogsStaffActionLogsController extends Controller {
|
||||||
@action
|
@action
|
||||||
showCustomDetailsModal(model, event) {
|
showCustomDetailsModal(model, event) {
|
||||||
event?.preventDefault();
|
event?.preventDefault();
|
||||||
this.modal.show(ThemeChangeModal, { model: { staffActionLog: model } });
|
this.modal.show(AdminStaffActionLogComponent, {
|
||||||
|
model: { staffActionLog: model },
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -104,6 +104,12 @@ export default class StaffActionLog extends RestModel {
|
||||||
|
|
||||||
@discourseComputed("action_name")
|
@discourseComputed("action_name")
|
||||||
useCustomModalForDetails(actionName) {
|
useCustomModalForDetails(actionName) {
|
||||||
return ["change_theme", "delete_theme"].includes(actionName);
|
return [
|
||||||
|
"change_theme",
|
||||||
|
"delete_theme",
|
||||||
|
"tag_group_create",
|
||||||
|
"tag_group_destroy",
|
||||||
|
"tag_group_change",
|
||||||
|
].includes(actionName);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -34,26 +34,18 @@ class Admin::StaffActionLogsController < Admin::StaffController
|
||||||
prev = JSON.parse(prev) if prev
|
prev = JSON.parse(prev) if prev
|
||||||
cur = JSON.parse(cur) if cur
|
cur = JSON.parse(cur) if cur
|
||||||
|
|
||||||
diff_fields = {}
|
|
||||||
|
|
||||||
output = +"<h2>#{CGI.escapeHTML(cur&.dig("name").to_s)}</h2><p></p>"
|
output = +"<h2>#{CGI.escapeHTML(cur&.dig("name").to_s)}</h2><p></p>"
|
||||||
|
|
||||||
|
diff_fields = {}
|
||||||
diff_fields["name"] = { prev: prev&.dig("name").to_s, cur: cur&.dig("name").to_s }
|
diff_fields["name"] = { prev: prev&.dig("name").to_s, cur: cur&.dig("name").to_s }
|
||||||
|
|
||||||
%w[default user_selectable].each do |f|
|
case @history.action
|
||||||
diff_fields[f] = { prev: (!!prev&.dig(f)).to_s, cur: (!!cur&.dig(f)).to_s }
|
when *%i[change_theme delete_theme].map { |i| UserHistory.actions[i] }
|
||||||
|
diff_theme(diff_fields, prev, cur)
|
||||||
|
when *%i[tag_group_create tag_group_destroy tag_group_change].map { |i| UserHistory.actions[i] }
|
||||||
|
diff_tag_group(diff_fields, prev, cur)
|
||||||
end
|
end
|
||||||
|
|
||||||
diff_fields["color scheme"] = {
|
|
||||||
prev: prev&.dig("color_scheme", "name").to_s,
|
|
||||||
cur: cur&.dig("color_scheme", "name").to_s,
|
|
||||||
}
|
|
||||||
|
|
||||||
diff_fields["included themes"] = { prev: child_themes(prev), cur: child_themes(cur) }
|
|
||||||
|
|
||||||
load_diff(diff_fields, :cur, cur)
|
|
||||||
load_diff(diff_fields, :prev, prev)
|
|
||||||
|
|
||||||
diff_fields.delete_if { |k, v| v[:cur] == v[:prev] }
|
diff_fields.delete_if { |k, v| v[:cur] == v[:prev] }
|
||||||
|
|
||||||
diff_fields.each do |k, v|
|
diff_fields.each do |k, v|
|
||||||
|
@ -89,4 +81,30 @@ class Admin::StaffActionLogsController < Admin::StaffController
|
||||||
{ id: name, action_id: UserHistory.actions[name] || UserHistory.actions[:custom_staff] }
|
{ id: name, action_id: UserHistory.actions[name] || UserHistory.actions[:custom_staff] }
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def diff_theme(diff_fields, prev, cur)
|
||||||
|
%w[default user_selectable].each do |f|
|
||||||
|
diff_fields[f] = { prev: (!!prev&.dig(f)).to_s, cur: (!!cur&.dig(f)).to_s }
|
||||||
|
end
|
||||||
|
|
||||||
|
diff_fields["color scheme"] = {
|
||||||
|
prev: prev&.dig("color_scheme", "name").to_s,
|
||||||
|
cur: cur&.dig("color_scheme", "name").to_s,
|
||||||
|
}
|
||||||
|
|
||||||
|
diff_fields["included themes"] = { prev: child_themes(prev), cur: child_themes(cur) }
|
||||||
|
|
||||||
|
load_diff(diff_fields, :cur, cur)
|
||||||
|
load_diff(diff_fields, :prev, prev)
|
||||||
|
end
|
||||||
|
|
||||||
|
def diff_tag_group(diff_fields, prev, cur)
|
||||||
|
%w[parent_tag_name one_per_topic permissions].each do |f|
|
||||||
|
diff_fields[f] = { prev: prev&.dig(f).to_s, cur: cur&.dig(f).to_s }
|
||||||
|
end
|
||||||
|
diff_fields["tag_names"] = {
|
||||||
|
prev: prev&.dig("tag_names")&.join("\n"),
|
||||||
|
cur: cur&.dig("tag_names")&.join("\n"),
|
||||||
|
}
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -51,6 +51,10 @@ class TagGroupsController < ApplicationController
|
||||||
guardian.ensure_can_admin_tag_groups!
|
guardian.ensure_can_admin_tag_groups!
|
||||||
@tag_group = TagGroup.new(tag_groups_params)
|
@tag_group = TagGroup.new(tag_groups_params)
|
||||||
if @tag_group.save
|
if @tag_group.save
|
||||||
|
StaffActionLogger.new(current_user).log_tag_group_create(
|
||||||
|
@tag_group.name,
|
||||||
|
TagGroupSerializer.new(@tag_group).to_json(root: false),
|
||||||
|
)
|
||||||
render_serialized(@tag_group, TagGroupSerializer)
|
render_serialized(@tag_group, TagGroupSerializer)
|
||||||
else
|
else
|
||||||
render_json_error(@tag_group)
|
render_json_error(@tag_group)
|
||||||
|
@ -59,13 +63,20 @@ class TagGroupsController < ApplicationController
|
||||||
|
|
||||||
def update
|
def update
|
||||||
guardian.ensure_can_admin_tag_groups!
|
guardian.ensure_can_admin_tag_groups!
|
||||||
|
old_data = TagGroupSerializer.new(@tag_group).to_json(root: false)
|
||||||
json_result(@tag_group, serializer: TagGroupSerializer) do |tag_group|
|
json_result(@tag_group, serializer: TagGroupSerializer) do |tag_group|
|
||||||
@tag_group.update(tag_groups_params)
|
@tag_group.update(tag_groups_params)
|
||||||
|
new_data = TagGroupSerializer.new(@tag_group).to_json(root: false)
|
||||||
|
StaffActionLogger.new(current_user).log_tag_group_change(@tag_group.name, old_data, new_data)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def destroy
|
def destroy
|
||||||
guardian.ensure_can_admin_tag_groups!
|
guardian.ensure_can_admin_tag_groups!
|
||||||
|
StaffActionLogger.new(current_user).log_tag_group_destroy(
|
||||||
|
@tag_group.name,
|
||||||
|
TagGroupSerializer.new(@tag_group).to_json(root: false),
|
||||||
|
)
|
||||||
@tag_group.destroy
|
@tag_group.destroy
|
||||||
render json: success_json
|
render json: success_json
|
||||||
end
|
end
|
||||||
|
|
|
@ -152,6 +152,9 @@ class UserHistory < ActiveRecord::Base
|
||||||
custom_emoji_destroy: 113,
|
custom_emoji_destroy: 113,
|
||||||
delete_post_permanently: 114,
|
delete_post_permanently: 114,
|
||||||
delete_topic_permanently: 115,
|
delete_topic_permanently: 115,
|
||||||
|
tag_group_create: 116,
|
||||||
|
tag_group_destroy: 117,
|
||||||
|
tag_group_change: 118,
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -266,6 +269,9 @@ class UserHistory < ActiveRecord::Base
|
||||||
custom_emoji_destroy
|
custom_emoji_destroy
|
||||||
delete_post_permanently
|
delete_post_permanently
|
||||||
delete_topic_permanently
|
delete_topic_permanently
|
||||||
|
tag_group_create
|
||||||
|
tag_group_destroy
|
||||||
|
tag_group_change
|
||||||
]
|
]
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -332,7 +338,9 @@ class UserHistory < ActiveRecord::Base
|
||||||
end
|
end
|
||||||
|
|
||||||
def new_value_is_json?
|
def new_value_is_json?
|
||||||
[UserHistory.actions[:change_theme], UserHistory.actions[:delete_theme]].include?(action)
|
%i[change_theme delete_theme tag_group_create tag_group_destroy tag_group_change]
|
||||||
|
.map { |i| UserHistory.actions[i] }
|
||||||
|
.include?(action)
|
||||||
end
|
end
|
||||||
|
|
||||||
def previous_value_is_json?
|
def previous_value_is_json?
|
||||||
|
|
|
@ -1052,6 +1052,33 @@ class StaffActionLogger
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def log_tag_group_create(name, new_value, opts = {})
|
||||||
|
UserHistory.create!(
|
||||||
|
params(opts).merge(json_params(nil, new_value)).merge(
|
||||||
|
action: UserHistory.actions[:tag_group_create],
|
||||||
|
subject: name,
|
||||||
|
),
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
def log_tag_group_destroy(name, old_value, opts = {})
|
||||||
|
UserHistory.create!(
|
||||||
|
params(opts).merge(json_params(old_value, nil)).merge(
|
||||||
|
action: UserHistory.actions[:tag_group_destroy],
|
||||||
|
subject: name,
|
||||||
|
),
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
def log_tag_group_change(name, old_data, new_data)
|
||||||
|
UserHistory.create!(
|
||||||
|
params.merge(json_params(old_data, new_data)).merge(
|
||||||
|
action: UserHistory.actions[:tag_group_change],
|
||||||
|
subject: name,
|
||||||
|
),
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def json_params(previous_value, new_value)
|
def json_params(previous_value, new_value)
|
||||||
|
|
|
@ -6339,6 +6339,9 @@ en:
|
||||||
custom_emoji_destroy: "delete custom emoji"
|
custom_emoji_destroy: "delete custom emoji"
|
||||||
delete_post_permanently: "permanently delete post"
|
delete_post_permanently: "permanently delete post"
|
||||||
delete_topic_permanently: "permanently delete topic"
|
delete_topic_permanently: "permanently delete topic"
|
||||||
|
tag_group_create: "create tag group"
|
||||||
|
tag_group_destroy: "delete tag group"
|
||||||
|
tag_group_change: "change tag group"
|
||||||
screened_emails:
|
screened_emails:
|
||||||
title: "Screened Emails"
|
title: "Screened Emails"
|
||||||
description: "When someone tries to create a new account, the following email addresses will be checked and the registration will be blocked, or some other action performed."
|
description: "When someone tries to create a new account, the following email addresses will be checked and the registration will be blocked, or some other action performed."
|
||||||
|
|
|
@ -129,10 +129,45 @@ RSpec.describe Admin::StaffActionLogsController do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
shared_examples "tag_group diffs accessible" do
|
||||||
|
it "generates diffs for tag_group changes" do
|
||||||
|
tag1 = Fabricate(:tag)
|
||||||
|
tag2 = Fabricate(:tag)
|
||||||
|
tag3 = Fabricate(:tag)
|
||||||
|
tag_group1 = Fabricate(:tag_group, tags: [tag1, tag2])
|
||||||
|
|
||||||
|
old_json = TagGroupSerializer.new(tag_group1, root: false).to_json
|
||||||
|
|
||||||
|
tag_group2 = Fabricate(:tag_group, tags: [tag2, tag3])
|
||||||
|
|
||||||
|
new_json = TagGroupSerializer.new(tag_group2, root: false).to_json
|
||||||
|
|
||||||
|
record =
|
||||||
|
StaffActionLogger.new(Discourse.system_user).log_tag_group_change(
|
||||||
|
tag_group2.name,
|
||||||
|
old_json,
|
||||||
|
new_json,
|
||||||
|
)
|
||||||
|
|
||||||
|
get "/admin/logs/staff_action_logs/#{record.id}/diff.json"
|
||||||
|
expect(response.status).to eq(200)
|
||||||
|
|
||||||
|
parsed = response.parsed_body
|
||||||
|
|
||||||
|
name_diff = <<-HTML
|
||||||
|
<h3>name</h3><p></p><table class="markdown"><tr><td class="diff-del"><del>#{tag_group1.name}</del></td><td class="diff-ins"><ins>#{tag_group2.name}</ins></td></tr></table>
|
||||||
|
HTML
|
||||||
|
expect(parsed["side_by_side"]).to include(name_diff.strip)
|
||||||
|
expect(parsed["side_by_side"]).to include("<del>#{tag1.name}</del>")
|
||||||
|
expect(parsed["side_by_side"]).to include("<ins>#{tag3.name}</ins>")
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
context "when logged in as an admin" do
|
context "when logged in as an admin" do
|
||||||
before { sign_in(admin) }
|
before { sign_in(admin) }
|
||||||
|
|
||||||
include_examples "theme diffs accessible"
|
include_examples "theme diffs accessible"
|
||||||
|
include_examples "tag_group diffs accessible"
|
||||||
|
|
||||||
it "is not erroring when current value is empty" do
|
it "is not erroring when current value is empty" do
|
||||||
theme = Fabricate(:theme)
|
theme = Fabricate(:theme)
|
||||||
|
@ -146,6 +181,7 @@ RSpec.describe Admin::StaffActionLogsController do
|
||||||
before { sign_in(moderator) }
|
before { sign_in(moderator) }
|
||||||
|
|
||||||
include_examples "theme diffs accessible"
|
include_examples "theme diffs accessible"
|
||||||
|
include_examples "tag_group diffs accessible"
|
||||||
end
|
end
|
||||||
|
|
||||||
context "when logged in as a non-staff user" do
|
context "when logged in as a non-staff user" do
|
||||||
|
|
|
@ -147,4 +147,96 @@ RSpec.describe TagGroupsController do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
describe "#create" do
|
||||||
|
fab!(:admin)
|
||||||
|
|
||||||
|
fab!(:tag1) { Fabricate(:tag) }
|
||||||
|
fab!(:tag2) { Fabricate(:tag) }
|
||||||
|
|
||||||
|
before { sign_in(admin) }
|
||||||
|
|
||||||
|
it "should create a tag group and log the creation" do
|
||||||
|
post "/tag_groups.json",
|
||||||
|
params: {
|
||||||
|
tag_group: {
|
||||||
|
name: "test_tag_group_log",
|
||||||
|
tag_names: [tag1.name, tag2.name],
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
expect(response.status).to eq(200)
|
||||||
|
|
||||||
|
expect(TagGroup.last.id).to eq(response.parsed_body["tag_group"]["id"])
|
||||||
|
|
||||||
|
expect(UserHistory.last).to have_attributes(
|
||||||
|
acting_user_id: admin.id,
|
||||||
|
action: UserHistory.actions[:tag_group_create],
|
||||||
|
subject: "test_tag_group_log",
|
||||||
|
new_value: response.parsed_body["tag_group"].to_json,
|
||||||
|
)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
describe "#delete" do
|
||||||
|
fab!(:admin)
|
||||||
|
|
||||||
|
fab!(:tag1) { Fabricate(:tag) }
|
||||||
|
fab!(:tag2) { Fabricate(:tag) }
|
||||||
|
fab!(:tag_group) { Fabricate(:tag_group, tags: [tag1, tag2]) }
|
||||||
|
|
||||||
|
before { sign_in(admin) }
|
||||||
|
|
||||||
|
it "should delete the tag group and log the deletion" do
|
||||||
|
previous_value = TagGroupSerializer.new(tag_group).to_json(root: false)
|
||||||
|
|
||||||
|
delete "/tag_groups/#{tag_group.id}.json"
|
||||||
|
|
||||||
|
expect(response.status).to eq(200)
|
||||||
|
|
||||||
|
expect(TagGroup.find_by(id: tag_group.id)).to eq(nil)
|
||||||
|
|
||||||
|
expect(UserHistory.last).to have_attributes(
|
||||||
|
acting_user_id: admin.id,
|
||||||
|
action: UserHistory.actions[:tag_group_destroy],
|
||||||
|
subject: tag_group.name,
|
||||||
|
previous_value:,
|
||||||
|
)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
describe "#update" do
|
||||||
|
fab!(:admin)
|
||||||
|
|
||||||
|
fab!(:tag1) { Fabricate(:tag) }
|
||||||
|
fab!(:tag2) { Fabricate(:tag) }
|
||||||
|
fab!(:tag3) { Fabricate(:tag) }
|
||||||
|
fab!(:tag_group) { Fabricate(:tag_group, tags: [tag1, tag2]) }
|
||||||
|
|
||||||
|
before { sign_in(admin) }
|
||||||
|
|
||||||
|
it "should update the tag group and log the modification" do
|
||||||
|
previous_value = TagGroupSerializer.new(tag_group).to_json(root: false)
|
||||||
|
|
||||||
|
put "/tag_groups/#{tag_group.id}.json",
|
||||||
|
params: {
|
||||||
|
tag_group: {
|
||||||
|
tag_group: {
|
||||||
|
name: "test_tag_group_new_name",
|
||||||
|
tag_names: [tag2.name, tag3.name],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
expect(response.status).to eq(200)
|
||||||
|
|
||||||
|
expect(UserHistory.last).to have_attributes(
|
||||||
|
acting_user_id: admin.id,
|
||||||
|
action: UserHistory.actions[:tag_group_change],
|
||||||
|
subject: tag_group.name,
|
||||||
|
previous_value:,
|
||||||
|
new_value: response.parsed_body["tag_group"].to_json,
|
||||||
|
)
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue
Block a user