github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-25 00:32:52 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: update more deprecated font awesome icon names (#30123)

Browse Source 
* update more deprecated font awesome icon names

* add migration to remove deprecated default for badges.icon
This commit is contained in:
Kelv
2024-12-05 15:20:02 +08:00
committed by GitHub
parent 8a89a77248
commit 1ca90c3070
15 changed files with 69 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/app/components/group-card-contents.js
View File

@ -62,7 +62,7 @@ export default class GroupCardContents extends CardContentsBase.extend(
this.setProperties({ group }); this.setProperties({ group });
if (!group.flair_url && !group.flair_bg_color) { if (!group.flair_url && !group.flair_bg_color) {
group.set("flair_url", "fa-users"); group.set("flair_url", "users");
} }
if (group.can_see_members && group.members.length < maxMembersToDisplay) { if (group.can_see_members && group.members.length < maxMembersToDisplay) {

2
app/assets/javascripts/discourse/tests/acceptance/group-manage-email-settings-test.js
View File

@ -215,7 +215,7 @@ acceptance(
visible: true, visible: true,
public_admission: true, public_admission: true,
public_exit: false, public_exit: false,
flair_url: "fa-circle-half-stroke", flair_url: "circle-half-stroke",
is_group_owner: true, is_group_owner: true,
mentionable: true, mentionable: true,
messageable: true, messageable: true,

2
app/assets/javascripts/discourse/tests/acceptance/search-full-test.js
View File

@ -70,7 +70,7 @@ acceptance("Search - Full Page", function (needs) {
grant_count: 0, grant_count: 0,
allow_title: false, allow_title: false,
multiple_grant: false, multiple_grant: false,
icon: "fa-certificate", icon: "certificate",
image: null, image: null,
listable: true, listable: true,
enabled: true, enabled: true,

56
app/assets/javascripts/discourse/tests/fixtures/badges-fixture.js vendored
View File

@ -60,7 +60,7 @@ export default {
grant_count: 11, grant_count: 11,
allow_title: true, allow_title: true,
multiple_grant: false, multiple_grant: false,
icon: "fa-certificate", icon: "certificate",
listable: true, listable: true,
enabled: true, enabled: true,
badge_grouping_id: 8, badge_grouping_id: 8,
@ -75,7 +75,7 @@ export default {
grant_count: 10, grant_count: 10,
allow_title: true, allow_title: true,
multiple_grant: false, multiple_grant: false,
icon: "fa-gear", icon: "gear",
listable: true, listable: true,
enabled: true, enabled: true,
badge_grouping_id: 8, badge_grouping_id: 8,
@ -89,7 +89,7 @@ export default {
grant_count: 29, grant_count: 29,
allow_title: true, allow_title: true,
multiple_grant: false, multiple_grant: false,
icon: "fa-certificate", icon: "certificate",
listable: true, listable: true,
enabled: true, enabled: true,
badge_grouping_id: 4, badge_grouping_id: 4,
@ -103,7 +103,7 @@ export default {
grant_count: 200, grant_count: 200,
allow_title: false, allow_title: false,
multiple_grant: false, multiple_grant: false,
icon: "fa-certificate", icon: "certificate",
listable: true, listable: true,
enabled: true, enabled: true,
badge_grouping_id: 8, badge_grouping_id: 8,
@ -118,7 +118,7 @@ export default {
grant_count: 9, grant_count: 9,
allow_title: true, allow_title: true,
multiple_grant: false, multiple_grant: false,
icon: "fa-bug", icon: "bug",
listable: true, listable: true,
enabled: true, enabled: true,
badge_grouping_id: 7, badge_grouping_id: 7,
@ -132,7 +132,7 @@ export default {
grant_count: 0, grant_count: 0,
allow_title: true, allow_title: true,
multiple_grant: false, multiple_grant: false,
icon: "fa-certificate", icon: "certificate",
listable: true, listable: true,
enabled: true, enabled: true,
badge_grouping_id: 8, badge_grouping_id: 8,
@ -146,7 +146,7 @@ export default {
grant_count: 467, grant_count: 467,
allow_title: false, allow_title: false,
multiple_grant: false, multiple_grant: false,
icon: "fa-certificate", icon: "certificate",
listable: true, listable: true,
enabled: true, enabled: true,
badge_grouping_id: 4, badge_grouping_id: 4,
@ -161,7 +161,7 @@ export default {
grant_count: 183, grant_count: 183,
allow_title: false, allow_title: false,
multiple_grant: false, multiple_grant: false,
icon: "fa-bug", icon: "bug",
listable: true, listable: true,
enabled: true, enabled: true,
badge_grouping_id: 7, badge_grouping_id: 7,
@ -175,7 +175,7 @@ export default {
grant_count: 4, grant_count: 4,
allow_title: true, allow_title: true,
multiple_grant: false, multiple_grant: false,
icon: "fa-certificate", icon: "certificate",
listable: true, listable: true,
enabled: true, enabled: true,
badge_grouping_id: 4, badge_grouping_id: 4,
@ -189,7 +189,7 @@ export default {
grant_count: 278, grant_count: 278,
allow_title: false, allow_title: false,
multiple_grant: false, multiple_grant: false,
icon: "fa-certificate", icon: "certificate",
listable: true, listable: true,
enabled: true, enabled: true,
badge_grouping_id: 1, badge_grouping_id: 1,
@ -203,7 +203,7 @@ export default {
grant_count: 5834, grant_count: 5834,
allow_title: false, allow_title: false,
multiple_grant: false, multiple_grant: false,
icon: "fa-certificate", icon: "certificate",
listable: true, listable: true,
enabled: true, enabled: true,
badge_grouping_id: 4, badge_grouping_id: 4,
@ -217,7 +217,7 @@ export default {
grant_count: 60, grant_count: 60,
allow_title: false, allow_title: false,
multiple_grant: false, multiple_grant: false,
icon: "fa-certificate", icon: "certificate",
listable: true, listable: true,
enabled: true, enabled: true,
badge_grouping_id: 1, badge_grouping_id: 1,
@ -231,7 +231,7 @@ export default {
grant_count: 22, grant_count: 22,
allow_title: false, allow_title: false,
multiple_grant: true, multiple_grant: true,
icon: "fa-certificate", icon: "certificate",
listable: true, listable: true,
enabled: true, enabled: true,
badge_grouping_id: 3, badge_grouping_id: 3,
@ -245,7 +245,7 @@ export default {
grant_count: 2, grant_count: 2,
allow_title: false, allow_title: false,
multiple_grant: true, multiple_grant: true,
icon: "fa-certificate", icon: "certificate",
listable: true, listable: true,
enabled: true, enabled: true,
badge_grouping_id: 3, badge_grouping_id: 3,
@ -259,7 +259,7 @@ export default {
grant_count: 2387, grant_count: 2387,
allow_title: false, allow_title: false,
multiple_grant: false, multiple_grant: false,
icon: "fa-certificate", icon: "certificate",
listable: true, listable: true,
enabled: true, enabled: true,
badge_grouping_id: 1, badge_grouping_id: 1,
@ -273,7 +273,7 @@ export default {
grant_count: 285, grant_count: 285,
allow_title: false, allow_title: false,
multiple_grant: false, multiple_grant: false,
icon: "fa-certificate", icon: "certificate",
listable: true, listable: true,
enabled: true, enabled: true,
badge_grouping_id: 1, badge_grouping_id: 1,
@ -287,7 +287,7 @@ export default {
grant_count: 42, grant_count: 42,
allow_title: false, allow_title: false,
multiple_grant: false, multiple_grant: false,
icon: "fa-certificate", icon: "certificate",
listable: true, listable: true,
enabled: true, enabled: true,
badge_grouping_id: 2, badge_grouping_id: 2,
@ -301,7 +301,7 @@ export default {
grant_count: 1718, grant_count: 1718,
allow_title: false, allow_title: false,
multiple_grant: false, multiple_grant: false,
icon: "fa-certificate", icon: "certificate",
listable: true, listable: true,
enabled: true, enabled: true,
badge_grouping_id: 2, badge_grouping_id: 2,
@ -315,7 +315,7 @@ export default {
grant_count: 270, grant_count: 270,
allow_title: false, allow_title: false,
multiple_grant: false, multiple_grant: false,
icon: "fa-certificate", icon: "certificate",
listable: true, listable: true,
enabled: true, enabled: true,
badge_grouping_id: 1, badge_grouping_id: 1,
@ -330,7 +330,7 @@ export default {
grant_count: 545, grant_count: 545,
allow_title: false, allow_title: false,
multiple_grant: false, multiple_grant: false,
icon: "fa-certificate", icon: "certificate",
listable: true, listable: true,
enabled: true, enabled: true,
badge_grouping_id: 1, badge_grouping_id: 1,
@ -344,7 +344,7 @@ export default {
grant_count: 397, grant_count: 397,
allow_title: false, allow_title: false,
multiple_grant: false, multiple_grant: false,
icon: "fa-certificate", icon: "certificate",
listable: true, listable: true,
enabled: true, enabled: true,
badge_grouping_id: 1, badge_grouping_id: 1,
@ -358,7 +358,7 @@ export default {
grant_count: 259, grant_count: 259,
allow_title: false, allow_title: false,
multiple_grant: true, multiple_grant: true,
icon: "fa-certificate", icon: "certificate",
listable: true, listable: true,
enabled: true, enabled: true,
badge_grouping_id: 3, badge_grouping_id: 3,
@ -372,7 +372,7 @@ export default {
grant_count: 933, grant_count: 933,
allow_title: false, allow_title: false,
multiple_grant: false, multiple_grant: false,
icon: "fa-certificate", icon: "certificate",
listable: true, listable: true,
enabled: true, enabled: true,
badge_grouping_id: 2, badge_grouping_id: 2,
@ -396,7 +396,7 @@ export default {
grant_count: 545, grant_count: 545,
allow_title: false, allow_title: false,
multiple_grant: false, multiple_grant: false,
icon: "fa-certificate", icon: "certificate",
listable: true, listable: true,
enabled: true, enabled: true,
badge_grouping_id: 1, badge_grouping_id: 1,
@ -419,7 +419,7 @@ export default {
grant_count: 10, grant_count: 10,
allow_title: true, allow_title: true,
multiple_grant: true, multiple_grant: true,
icon: "fa-certificate", icon: "certificate",
listable: true, listable: true,
enabled: true, enabled: true,
badge_grouping_id: 1, badge_grouping_id: 1,
@ -437,7 +437,7 @@ export default {
grant_count: 545, grant_count: 545,
allow_title: false, allow_title: false,
multiple_grant: false, multiple_grant: false,
icon: "fa-certificate", icon: "certificate",
listable: true, listable: true,
enabled: true, enabled: true,
badge_grouping_id: 1, badge_grouping_id: 1,
@ -1714,7 +1714,7 @@ export default {
{ {
id: 1, id: 1,
name: "Only icon", name: "Only icon",
icon: "fa-rocket", icon: "rocket",
}, },
{ {
id: 2, id: 2,
@ -1724,7 +1724,7 @@ export default {
{ {
id: 3, id: 3,
name: "Both image and icon", name: "Both image and icon",
icon: "fa-rocket", icon: "rocket",
image_url: "/images/avatar.png?3", image_url: "/images/avatar.png?3",
multiple_grant: true, multiple_grant: true,
query: "SELECT 1", query: "SELECT 1",

12
app/assets/javascripts/discourse/tests/fixtures/group-fixtures.js vendored
View File

@ -42,7 +42,7 @@ export default {
visible: true, visible: true,
public_admission: true, public_admission: true,
public_exit: false, public_exit: false,
flair_url: "fa-circle-half-stroke", flair_url: "circle-half-stroke",
is_group_owner: true, is_group_owner: true,
mentionable: true, mentionable: true,
messageable: true, messageable: true,
@ -66,7 +66,7 @@ export default {
visible: true, visible: true,
public_admission: true, public_admission: true,
public_exit: false, public_exit: false,
flair_url: "fa-circle-half-stroke", flair_url: "circle-half-stroke",
is_group_owner: true, is_group_owner: true,
mentionable: true, mentionable: true,
messageable: true, messageable: true,
@ -260,7 +260,7 @@ export default {
}, },
}, },
"/groups/discourse/posts.json": { "/groups/discourse/posts.json": {
"posts": [ posts: [
{ {
id: 94607, id: 94607,
cooked: cooked:
@ -1319,8 +1319,8 @@ export default {
avatar_template: avatar_template:
"/user_avatar/meta.discourse.org/codinghorror/{size}/5297.png", "/user_avatar/meta.discourse.org/codinghorror/{size}/5297.png",
}, },
} },
] ],
}, },
"/groups/alternative-group.json": { "/groups/alternative-group.json": {
group: { group: {
@ -1334,7 +1334,7 @@ export default {
has_messages: true, has_messages: true,
public_admission: true, public_admission: true,
public_exit: false, public_exit: false,
flair_url: "fa-circle-half-stroke", flair_url: "circle-half-stroke",
is_group_owner: true, is_group_owner: true,
mentionable: true, mentionable: true,
messageable: true, messageable: true,

6
app/assets/javascripts/discourse/tests/fixtures/user-fixtures.js vendored
View File

@ -49,7 +49,7 @@ export default {
grant_count: 14, grant_count: 14,
allow_title: false, allow_title: false,
multiple_grant: true, multiple_grant: true,
icon: "fa-certificate", icon: "certificate",
image: null, image: null,
listable: true, listable: true,
enabled: true, enabled: true,
@ -349,7 +349,7 @@ export default {
grant_count: 14, grant_count: 14,
allow_title: false, allow_title: false,
multiple_grant: true, multiple_grant: true,
icon: "fa-certificate", icon: "certificate",
image: null, image: null,
listable: true, listable: true,
enabled: true, enabled: true,
@ -3210,7 +3210,7 @@ export default {
grant_count: 14, grant_count: 14,
allow_title: false, allow_title: false,
multiple_grant: true, multiple_grant: true,
icon: "fa-certificate", icon: "certificate",
image: null, image: null,
listable: true, listable: true,
enabled: true, enabled: true,

10
app/assets/javascripts/discourse/tests/integration/components/user-avatar-flair-test.js
View File

@ -9,28 +9,28 @@ function setupSiteGroups(that) {
{ {
id: 1, id: 1,
name: "admins", name: "admins",
flair_url: "fa-bars", flair_url: "bars",
flair_bg_color: "CC000A", flair_bg_color: "CC000A",
flair_color: "FFFFFA", flair_color: "FFFFFA",
}, },
{ {
id: 2, id: 2,
name: "staff", name: "staff",
flair_url: "fa-bars", flair_url: "bars",
flair_bg_color: "CC0005", flair_bg_color: "CC0005",
flair_color: "FFFFF5", flair_color: "FFFFF5",
}, },
{ {
id: 3, id: 3,
name: "trust_level_1", name: "trust_level_1",
flair_url: "fa-dice-one", flair_url: "dice-one",
flair_bg_color: "CC0001", flair_bg_color: "CC0001",
flair_color: "FFFFF1", flair_color: "FFFFF1",
}, },
{ {
id: 4, id: 4,
name: "trust_level_2", name: "trust_level_2",
flair_url: "fa-dice-two", flair_url: "dice-two",
flair_bg_color: "CC0002", flair_bg_color: "CC0002",
flair_color: "FFFFF2", flair_color: "FFFFF2",
}, },
@ -159,7 +159,7 @@ module("Integration | Component | user-avatar-flair", function (hooks) {
moderator: false, moderator: false,
trust_level: 3, trust_level: 3,
flair_name: "Band Geeks", flair_name: "Band Geeks",
flair_url: "fa-xmark", flair_url: "xmark",
flair_bg_color: "123456", flair_bg_color: "123456",
flair_color: "B0B0B0", flair_color: "B0B0B0",
flair_group_id: 41, flair_group_id: 41,

2
app/assets/javascripts/discourse/tests/integration/components/widgets/avatar-flair-test.js
View File

@ -8,7 +8,7 @@ module("Integration | Component | Widget | avatar-flair", function (hooks) {
test("avatar flair with an icon", async function (assert) { test("avatar flair with an icon", async function (assert) {
this.set("args", { this.set("args", {
flair_url: "fa-bars", flair_url: "bars",
flair_bg_color: "CC0000", flair_bg_color: "CC0000",
flair_color: "FFFFFF", flair_color: "FFFFFF",
}); });

6
app/models/badge.rb
View File

@ -252,7 +252,7 @@ class Badge < ActiveRecord::Base
def default_icon=(val) def default_icon=(val)
if self.image_upload_id.blank? if self.image_upload_id.blank?
self.icon ||= val self.icon ||= val
self.icon = val if self.icon == "fa-certificate" self.icon = val if self.icon == "certificate"
end end
end end
@ -353,7 +353,7 @@ end
# updated_at :datetime not null # updated_at :datetime not null
# allow_title :boolean default(FALSE), not null # allow_title :boolean default(FALSE), not null
# multiple_grant :boolean default(FALSE), not null # multiple_grant :boolean default(FALSE), not null
# icon :string default("fa-certificate") # icon :string default("certificate")
# listable :boolean default(TRUE) # listable :boolean default(TRUE)
# target_posts :boolean default(FALSE) # target_posts :boolean default(FALSE)
# query :text # query :text
@ -363,9 +363,9 @@ end
# trigger :integer # trigger :integer
# show_posts :boolean default(FALSE), not null # show_posts :boolean default(FALSE), not null
# system :boolean default(FALSE), not null # system :boolean default(FALSE), not null
# show_in_post_header :boolean default(FALSE), not null
# long_description :text # long_description :text
# image_upload_id :integer # image_upload_id :integer
# show_in_post_header :boolean default(FALSE), not null
# #
# Indexes # Indexes
# #

2
app/views/users/omniauth_callbacks/confirm_request.html.erb
View File

@ -5,7 +5,7 @@
<form method="post"> <form method="post">
<%= hidden_field_tag :authenticity_token, form_authenticity_token %> <%= hidden_field_tag :authenticity_token, form_authenticity_token %>
<%= button_tag(type: "submit", class: "btn btn-primary") do %> <%= button_tag(type: "submit", class: "btn btn-primary") do %>
<%= SvgSprite.raw_svg('fa-plug') %><%= t 'login.omniauth_confirm_button' %> <%= SvgSprite.raw_svg('plug') %><%= t 'login.omniauth_confirm_button' %>
<% end %> <% end %>
</form> </form>
</div> </div>

8
db/fixtures/006_badges.rb
View File

@ -156,7 +156,7 @@ end
Badge.seed do |b| Badge.seed do |b|
b.id = id b.id = id
b.name = name b.name = name
b.default_icon = "fa-user-plus" b.default_icon = "user-plus"
b.badge_type_id = type b.badge_type_id = type
b.multiple_grant = false b.multiple_grant = false
b.target_posts = false b.target_posts = false
@ -339,7 +339,7 @@ end
Badge.seed do |b| Badge.seed do |b|
b.id = id b.id = id
b.name = name b.name = name
b.default_icon = "fa-heart" b.default_icon = "heart"
b.badge_type_id = level b.badge_type_id = level
b.query = BadgeQueries.liked_posts(post_count, like_count) b.query = BadgeQueries.liked_posts(post_count, like_count)
b.default_badge_grouping_id = BadgeGrouping::Community b.default_badge_grouping_id = BadgeGrouping::Community
@ -357,7 +357,7 @@ end
Badge.seed do |b| Badge.seed do |b|
b.id = id b.id = id
b.name = name b.name = name
b.default_icon = "fa-heart" b.default_icon = "heart"
b.badge_type_id = level b.badge_type_id = level
b.query = BadgeQueries.liked_back(count, ratio) b.query = BadgeQueries.liked_back(count, ratio)
b.default_badge_grouping_id = BadgeGrouping::Community b.default_badge_grouping_id = BadgeGrouping::Community
@ -375,7 +375,7 @@ end
Badge.seed do |b| Badge.seed do |b|
b.id = id b.id = id
b.name = name b.name = name
b.default_icon = "fa-heart" b.default_icon = "heart"
b.badge_type_id = level b.badge_type_id = level
b.query = BadgeQueries.like_rate_limit(count) b.query = BadgeQueries.like_rate_limit(count)
b.default_badge_grouping_id = BadgeGrouping::Community b.default_badge_grouping_id = BadgeGrouping::Community

12
db/migrate/20241205035402_change_default_for_badges_icon.rb Normal file
View File

@ -0,0 +1,12 @@
# frozen_string_literal: true
class ChangeDefaultForBadgesIcon < ActiveRecord::Migration[7.2]
def change
change_column_default :badges, :icon, from: "fa-certificate", to: "certificate"
up_only { execute <<~SQL }
UPDATE badges
SET icon = 'certificate'
WHERE icon = 'fa-certificate';
SQL
end
end

2
plugins/chat/assets/javascripts/discourse/components/chat-message.gjs
View File

@ -667,7 +667,7 @@ export default class ChatMessage extends Component {
<div class="stop-streaming-btn-container"> <div class="stop-streaming-btn-container">
<DButton <DButton
class="stop-streaming-btn" class="stop-streaming-btn"
@icon="stop-circle" @icon="circle-stop"
@label="cancel" @label="cancel"
@action={{fn this.stopMessageStreaming @message}} @action={{fn this.stopMessageStreaming @message}}
/> />

2
plugins/chat/plugin.rb
View File

@ -24,7 +24,7 @@ register_svg_icon "clipboard"
register_svg_icon "file-audio" register_svg_icon "file-audio"
register_svg_icon "file-video" register_svg_icon "file-video"
register_svg_icon "file-image" register_svg_icon "file-image"
register_svg_icon "stop-circle" register_svg_icon "circle-stop"
# route: /admin/plugins/chat # route: /admin/plugins/chat
add_admin_route "chat.admin.title", "chat", use_new_show_route: true add_admin_route "chat.admin.title", "chat", use_new_show_route: true

3
spec/lib/svg_sprite/svg_sprite_spec.rb
View File

@ -26,13 +26,12 @@ RSpec.describe SvgSprite do
end end
it "can search for a specific FA icon" do it "can search for a specific FA icon" do
expect(SvgSprite.search("fa-heart")).to match(/heart/)
expect(SvgSprite.search("poo-storm")).to match(/poo-storm/) expect(SvgSprite.search("poo-storm")).to match(/poo-storm/)
expect(SvgSprite.search("this-is-not-an-icon")).to eq(false) expect(SvgSprite.search("this-is-not-an-icon")).to eq(false)
end end
it "can get a raw SVG for an icon" do it "can get a raw SVG for an icon" do
expect(SvgSprite.raw_svg("fa-heart")).to match(/svg.*svg/) # SVG inside SVG expect(SvgSprite.raw_svg("heart")).to match(/svg.*svg/) # SVG inside SVG
expect(SvgSprite.raw_svg("this-is-not-an-icon")).to eq("") expect(SvgSprite.raw_svg("this-is-not-an-icon")).to eq("")
end end