IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: flag valid type inclusion should be lambda (#28030)

Browse Source 
There is a bug with chat type flags - "An error occurred: Applies to is not included in the list"

Flag.valid_applies_to_types is a set of core types and types registered by plugins `Set.new(DEFAULT_VALID_APPLIES_TO | DiscoursePluginRegistry.flag_applies_to_types)`

Using lamba should ensure that valid values are calculated dynamically.
This commit is contained in:
Krzysztof Kotlarek 2024-07-23 11:47:50 +10:00 committed by GitHub
parent fc09236c0c
commit e020888b0a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/services/flags/create_flag.rb
View File

@ -22,7 +22,7 @@ class Flags::CreateFlag
validates :description, presence: true validates :description, presence: true
validates :name, length: { maximum: Flag::MAX_NAME_LENGTH } validates :name, length: { maximum: Flag::MAX_NAME_LENGTH }
validates :description, length: { maximum: Flag::MAX_DESCRIPTION_LENGTH } validates :description, length: { maximum: Flag::MAX_DESCRIPTION_LENGTH }
validates :applies_to, inclusion: { in: Flag.valid_applies_to_types }, allow_nil: false validates :applies_to, inclusion: { in: -> { Flag.valid_applies_to_types } }, allow_nil: false
end end
private private

2
app/services/flags/update_flag.rb
View File

@ -24,7 +24,7 @@ class Flags::UpdateFlag
validates :description, presence: true validates :description, presence: true
validates :name, length: { maximum: Flag::MAX_NAME_LENGTH } validates :name, length: { maximum: Flag::MAX_NAME_LENGTH }
validates :description, length: { maximum: Flag::MAX_DESCRIPTION_LENGTH } validates :description, length: { maximum: Flag::MAX_DESCRIPTION_LENGTH }
validates :applies_to, inclusion: { in: Flag.valid_applies_to_types }, allow_nil: false validates :applies_to, inclusion: { in: -> { Flag.valid_applies_to_types } }, allow_nil: false
end end
private private

11
spec/services/flags/create_flag_spec.rb
View File

@ -61,7 +61,14 @@ RSpec.describe(Flags::CreateFlag) do
context "when user is allowed to perform the action" do context "when user is allowed to perform the action" do
fab!(:current_user) { Fabricate(:admin) } fab!(:current_user) { Fabricate(:admin) }
let(:applies_to) { ["Topic::Custom"] }
before do
DiscoursePluginRegistry.register_flag_applies_to_type(
"Topic::Custom",
OpenStruct.new(enabled?: true),
)
end
after { Flag.destroy_by(name: "custom flag name") } after { Flag.destroy_by(name: "custom flag name") }
it "sets the service result as successful" do it "sets the service result as successful" do
@ -73,7 +80,7 @@ RSpec.describe(Flags::CreateFlag) do
flag = Flag.last flag = Flag.last
expect(flag.name).to eq("custom flag name") expect(flag.name).to eq("custom flag name")
expect(flag.description).to eq("custom flag description") expect(flag.description).to eq("custom flag description")
expect(flag.applies_to).to eq(["Topic"]) expect(flag.applies_to).to eq(["Topic::Custom"])
expect(flag.require_message).to be true expect(flag.require_message).to be true
expect(flag.enabled).to be true expect(flag.enabled).to be true
end end
@ -83,7 +90,7 @@ RSpec.describe(Flags::CreateFlag) do
expect(UserHistory.last).to have_attributes( expect(UserHistory.last).to have_attributes(
custom_type: "create_flag", custom_type: "create_flag",
details: details:
"name: custom flag name\ndescription: custom flag description\napplies_to: [\"Topic\"]\nrequire_message: true\nenabled: true", "name: custom flag name\ndescription: custom flag description\napplies_to: [\"Topic::Custom\"]\nrequire_message: true\nenabled: true",
) )
end end
end end