A platform for community discussion. Free, open, simple.
DEV: Move Community sidebar section + links from migrations to seed fixture (#39973)
David Taylor85693658ff67
diff --git a/config/site_settings.yml b/config/site_settings.ymlindex 91512d26ea1..0c5d689157a 100644--- a/config/site_settings.yml+++ b/config/site_settings.yml@@ -3353,6 +3353,9 @@ navigation:- "top"- "bottom"area: "navigation"+ sidebar_seeded:+ default: false+ hidden: trueembedding:embed_full_app:diff --git a/db/fixtures/700_sidebar.rb b/db/fixtures/700_sidebar.rbnew file mode 100644index 00000000000..5b6620872ef--- /dev/null+++ b/db/fixtures/700_sidebar.rb@@ -0,0 +1,36 @@+# frozen_string_literal: true++return if SiteSetting.sidebar_seeded++community_section =+ SidebarSection+ .seed(:section_type) do |s|+ s.user_id = Discourse::SYSTEM_USER_ID+ s.title = "Community"+ s.public = true+ s.section_type = SidebarSection.section_types[:community]+ end+ .first++SidebarUrl::COMMUNITY_SECTION_LINKS.each_with_index do |link, position|+ url =+ SidebarUrl+ .seed(:value, :name) do |u|+ u.name = link[:name]+ u.value = link[:path]+ u.icon = link[:icon]+ u.segment = link[:segment]+ u.external = false+ end+ .first++ SidebarSectionLink.seed(:sidebar_section_id, :linkable_type, :linkable_id) do |l|+ l.user_id = Discourse::SYSTEM_USER_ID+ l.linkable_id = url.id+ l.linkable_type = "SidebarUrl"+ l.sidebar_section_id = community_section.id+ l.position = position+ end+end++SiteSetting.sidebar_seeded = truediff --git a/db/migrate/20230411032053_insert_community_to_sidebar_sections.rb b/db/migrate/20230411032053_insert_community_to_sidebar_sections.rbindex f0b192213ef..4a60bc6637f 100644--- a/db/migrate/20230411032053_insert_community_to_sidebar_sections.rb+++ b/db/migrate/20230411032053_insert_community_to_sidebar_sections.rb@@ -13,6 +13,8 @@ class InsertCommunityToSidebarSections < ActiveRecord::Migration[7.0]{ name: "Badges", path: "/badges", icon: "certificate", segment: 1 },]def up+ return if Migration::Helpers.new_site?+result = DB.query <<~SQLINSERT INTO sidebar_sections(user_id, title, public, section_type, created_at, updated_at)VALUES (-1, 'Community', true, 0, now(), now())diff --git a/db/migrate/20241025045928_add_invites_link_to_sidebar.rb b/db/migrate/20241025045928_add_invites_link_to_sidebar.rbindex 5a93948c8f3..a0f844c7783 100644--- a/db/migrate/20241025045928_add_invites_link_to_sidebar.rb+++ b/db/migrate/20241025045928_add_invites_link_to_sidebar.rb@@ -2,6 +2,8 @@class AddInvitesLinkToSidebar < ActiveRecord::Migration[7.1]def up+ return if Migration::Helpers.new_site?+community_section_id = DB.query_single(<<~SQL).firstSELECT idFROM sidebar_sectionsdiff --git a/db/migrate/20250626090725_add_my_messages_link_to_sidebar.rb b/db/migrate/20250626090725_add_my_messages_link_to_sidebar.rbindex b08ea86cbce..e0b01f7d3bc 100644--- a/db/migrate/20250626090725_add_my_messages_link_to_sidebar.rb+++ b/db/migrate/20250626090725_add_my_messages_link_to_sidebar.rb@@ -1,6 +1,8 @@# frozen_string_literal: trueclass AddMyMessagesLinkToSidebar < ActiveRecord::Migration[7.2]def up+ return if Migration::Helpers.new_site?+# Find the community sidebar sectioncommunity_section =DB.query_single(diff --git a/db/migrate/20250721043317_add_filter_link_to_sidebar.rb b/db/migrate/20250721043317_add_filter_link_to_sidebar.rbindex edf56d3d658..5f50e0206f6 100644--- a/db/migrate/20250721043317_add_filter_link_to_sidebar.rb+++ b/db/migrate/20250721043317_add_filter_link_to_sidebar.rb@@ -1,6 +1,8 @@# frozen_string_literal: trueclass AddFilterLinkToSidebar < ActiveRecord::Migration[7.0]def up+ return if Migration::Helpers.new_site?+# Find the community sectioncommunity_section_id = execute(<<~SQL).first&.fetch("id")SELECT id FROM sidebar_sections WHERE section_type = 0 LIMIT 1diff --git a/db/migrate/20260513105516_mark_existing_sites_sidebar_seeded.rb b/db/migrate/20260513105516_mark_existing_sites_sidebar_seeded.rbnew file mode 100644index 00000000000..29966b636fb--- /dev/null+++ b/db/migrate/20260513105516_mark_existing_sites_sidebar_seeded.rb@@ -0,0 +1,17 @@+# frozen_string_literal: true++class MarkExistingSitesSidebarSeeded < ActiveRecord::Migration[8.0]+ def up+ return if Migration::Helpers.new_site?++ execute(<<~SQL)+ INSERT INTO site_settings (name, data_type, value, created_at, updated_at)+ VALUES ('sidebar_seeded', 5, 't', NOW(), NOW())+ ON CONFLICT (name) DO UPDATE SET value = 't', updated_at = NOW()+ SQL+ end++ def down+ raise ActiveRecord::IrreversibleMigration+ end+enddiff --git a/spec/db/migrate/20260513105516_mark_existing_sites_sidebar_seeded_spec.rb b/spec/db/migrate/20260513105516_mark_existing_sites_sidebar_seeded_spec.rbnew file mode 100644index 00000000000..e98dbd0e55d--- /dev/null+++ b/spec/db/migrate/20260513105516_mark_existing_sites_sidebar_seeded_spec.rb@@ -0,0 +1,38 @@+# frozen_string_literal: true++require Rails.root.join("db/migrate/20260513105516_mark_existing_sites_sidebar_seeded.rb")++RSpec.describe MarkExistingSitesSidebarSeeded do+ before do+ @original_verbose = ActiveRecord::Migration.verbose+ ActiveRecord::Migration.verbose = false+ end++ after do+ ActiveRecord::Migration.verbose = @original_verbose+ Discourse.clear_site_creation_date_cache+ end++ it "is a no-op on fresh installs" do+ DB.exec("UPDATE schema_migration_details SET created_at = NOW()")+ Discourse.clear_site_creation_date_cache++ expect { described_class.new.up }.not_to change {+ DB.query_single("SELECT count(*) FROM site_settings WHERE name = 'sidebar_seeded'").first+ }+ end++ context "when the site is an existing install" do+ before do+ DB.exec("UPDATE schema_migration_details SET created_at = NOW() - INTERVAL '2 hours'")+ Discourse.clear_site_creation_date_cache+ end++ it "flips sidebar_seeded to true so the seed bails on the next deploy" do+ described_class.new.up++ row = DB.query("SELECT value FROM site_settings WHERE name = 'sidebar_seeded'")[0]+ expect(row.value).to eq("t")+ end+ end+end