-
Notifications
You must be signed in to change notification settings - Fork 12
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
FEATURE: display category icon in post body #36
Changes from 1 commit
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -199,6 +199,53 @@ export default { | |
} | ||
}); | ||
} | ||
|
||
if (settings.render_category_icon_in_post) { | ||
const site = api.container.lookup("service:site"); | ||
const slugMap = {}; | ||
for (const str of categoryThemeList) { | ||
const [slug, icon, color, match] = str.split(","); | ||
if (slug && icon) { | ||
for (const cat of site.categories) { | ||
if (match === "partial") { | ||
if (!cat.slug.toLowerCase().includes(slug.toLowerCase())) { | ||
continue; | ||
} | ||
} else { | ||
if (cat.slug.toLowerCase() !== slug.toLowerCase()) { | ||
continue; | ||
} | ||
} | ||
const opts = { | ||
icon, | ||
color, | ||
}; | ||
if (!color || color?.match(/categoryColo(u*)r/g)) { | ||
opts.color = `#${cat.color}`; | ||
} | ||
slugMap[cat.slug.toLowerCase()] = opts; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. What happens if there are multiple categories with empty slugs? (I'm basing this hypothetical off https://github.com/discourse/discourse/blob/main/app/models/category.rb#L688) There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We have a if (slug && icon) { Therefore, the category with an empty slug will not enter this statement. 😊 |
||
} | ||
} | ||
} | ||
api.decorateCookedElement((elem) => { | ||
const categorgHashtags = elem.querySelectorAll( | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. (nit) There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Fixed! |
||
'.hashtag-cooked[data-type="category"]' | ||
); | ||
for (const hashtag of categorgHashtags) { | ||
const opt = slugMap[hashtag.dataset?.slug?.toLowerCase()]; | ||
if (!opt) { | ||
continue; | ||
} | ||
const newIcon = document.createElement("span"); | ||
newIcon.classList.add("hashtag-category-icon"); | ||
newIcon.innerHTML = iconHTML(opt.icon); | ||
newIcon.style.color = opt.color; | ||
hashtag | ||
.querySelector("span.hashtag-category-badge") | ||
?.replaceWith(newIcon); | ||
} | ||
}); | ||
} | ||
}); | ||
}, | ||
}; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,89 @@ | ||
import { visit } from "@ember/test-helpers"; | ||
import { test } from "qunit"; | ||
import TopicFixtures from "discourse/tests/fixtures/topic"; | ||
import { acceptance } from "discourse/tests/helpers/qunit-helpers"; | ||
import { cloneJSON } from "discourse-common/lib/object"; | ||
|
||
function makeHashtagHTML(category) { | ||
return `<a class=\"hashtag-cooked\" href=\"${category.href}\" data-type=\"category\" data-slug=\"${category.slug}\" data-id=\"${category.id}\"><span class=\"hashtag-icon-placeholder\"><svg class=\"fa d-icon d-icon-square-full svg-icon svg-node\"><use href=\"#square-full\"></use></svg></span><span>${category.name}</span></a>`; | ||
} | ||
|
||
acceptance("Post body - Category icons", function (needs) { | ||
needs.user(); | ||
|
||
const categories = [ | ||
{ | ||
id: 1, | ||
name: "Category 1", | ||
slug: "category-1", | ||
color: "111111", | ||
}, | ||
{ | ||
id: 2, | ||
name: "Category 2", | ||
slug: "category-2", | ||
color: "000000", | ||
}, | ||
{ | ||
id: 3, | ||
name: "Category 3", | ||
slug: "category-3", | ||
color: "888888", | ||
}, | ||
]; | ||
|
||
needs.site({ | ||
categories, | ||
}); | ||
|
||
needs.hooks.beforeEach(function () { | ||
settings.category_lock_icon = "wrench"; | ||
settings.category_icon_list = `category-1,wrench,#FF0000|category-2,question-circle,categoryColor`; | ||
}); | ||
|
||
needs.pretender((server, helper) => { | ||
server.get("/t/131.json", () => { | ||
const topicList = cloneJSON(TopicFixtures["/t/130.json"]); | ||
topicList.post_stream.posts[0].cooked = `<p>${makeHashtagHTML( | ||
categories[0] | ||
)} ${makeHashtagHTML(categories[1])} ${makeHashtagHTML( | ||
categories[2] | ||
)}</p>`; | ||
return helper.response(topicList); | ||
}); | ||
}); | ||
|
||
test("Icon for category when `category_icon_list` theme setting has been configured", async function (assert) { | ||
await visit("/t/131"); | ||
|
||
assert | ||
.dom( | ||
`.cooked .hashtag-cooked[data-id="1"] .hashtag-category-icon .d-icon-wrench` | ||
) | ||
.exists("wrench icon is displayed for category-1"); | ||
|
||
assert | ||
.dom(`.cooked .hashtag-cooked[data-id="1"] .hashtag-category-icon`) | ||
.hasStyle( | ||
{ color: "rgb(255, 0, 0)" }, | ||
"category-1 's icon has the right color" | ||
); | ||
|
||
assert | ||
.dom( | ||
`.cooked .hashtag-cooked[data-id="2"] .hashtag-category-icon .d-icon-question-circle` | ||
) | ||
.exists("question-circle icon is displayed for category-2"); | ||
|
||
assert | ||
.dom(`.cooked .hashtag-cooked[data-id="2"] .hashtag-category-icon`) | ||
.hasStyle( | ||
{ color: "rgb(0, 0, 0)" }, | ||
"category-2 's icon has the right categoryColor" | ||
); | ||
|
||
assert | ||
.dom(`.cooked .hashtag-cooked[data-id="3"] .hashtag-category-badge`) | ||
.exists("unconfigured categories have a default badge"); | ||
}); | ||
}); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(minor) perhaps this could be simplified to something a single guard clause?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Probably could DRY out the repeated lowerCase calls too 🤔
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed!