DEV: group_list site settings should store IDs instead of group names (#7860)

* DEV: group_list site settings should store IDs instead of group names

* Ship site setting to know when we should migrate group_list settings

* Migrate existing group_list site settings

* Bump migration timestamp and don't set null when migrating is not possible.
This commit is contained in:
Roman Rizzi 2019-07-19 15:17:58 -03:00 committed by GitHub
parent e47e0af123
commit eb26bee046
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 35 additions and 7 deletions

View File

@ -3,6 +3,8 @@ import computed from "ember-addons/ember-computed-decorators";
export default Ember.Component.extend({ export default Ember.Component.extend({
@computed() @computed()
groupChoices() { groupChoices() {
return this.site.get("groups").map(g => g.name); return this.site.get("groups").map(g => {
return { name: g.name, id: g.id.toString() };
});
} }
}); });

View File

@ -1,3 +1,3 @@
{{list-setting settingValue=value choices=groupChoices settingName=setting.setting}} {{list-setting settingValue=value choices=groupChoices settingName='name'}}
{{setting-validation-message message=validationMessage}} {{setting-validation-message message=validationMessage}}
<div class='desc'>{{{unbound setting.description}}}</div> <div class='desc'>{{{unbound setting.description}}}</div>

View File

@ -0,0 +1,27 @@
# frozen_string_literal: true
class MigrateGroupListSiteSettings < ActiveRecord::Migration[5.2]
def up
migrate_value(:name, :id)
end
def down
migrate_value(:id, :name)
end
def migrate_value(from, to)
cast_type = from == :id ? '::int[]' : ''
DB.exec <<~SQL
UPDATE site_settings
SET value = COALESCE(array_to_string(
(
SELECT array_agg(groups.#{to})
FROM groups
WHERE groups.#{from} = ANY (string_to_array(site_settings.value, '|', '')#{cast_type})
),
'|', ''
), site_settings.value)
WHERE data_type = #{SiteSettings::TypeSupervisor.types[:group_list]}
SQL
end
end

View File

@ -743,5 +743,4 @@ module Discourse
def self.skip_post_deployment_migrations? def self.skip_post_deployment_migrations?
['1', 'true'].include?(ENV["SKIP_POST_DEPLOYMENT_MIGRATIONS"]&.to_s) ['1', 'true'].include?(ENV["SKIP_POST_DEPLOYMENT_MIGRATIONS"]&.to_s)
end end
end end

View File

@ -32,7 +32,7 @@ componentTest("default", {
setting: "foo_bar", setting: "foo_bar",
type: "group_list", type: "group_list",
validValues: undefined, validValues: undefined,
value: "Donuts" value: "1"
}) })
); );
}, },
@ -42,16 +42,16 @@ componentTest("default", {
assert.equal( assert.equal(
subject.header().value(), subject.header().value(),
"Donuts", "1",
"it selects the setting's value" "it selects the setting's value"
); );
await subject.expand(); await subject.expand();
await subject.selectRowByValue("Cheese cake"); await subject.selectRowByValue("2");
assert.equal( assert.equal(
subject.header().value(), subject.header().value(),
"Donuts,Cheese cake", "1,2",
"it allows to select a setting from the list of choices" "it allows to select a setting from the list of choices"
); );
} }