Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion assets/javascripts/discourse/components/docs-category.gjs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import discourseComputed from "discourse/lib/decorators";
export default class DocsCategory extends Component {
@discourseComputed("category")
categoryName(category) {
return this.site.categories.findBy("id", category.id).name;
return this.site.categories.find((item) => item.id === category.id)?.name;
}

<template>
Expand Down
15 changes: 11 additions & 4 deletions assets/javascripts/discourse/controllers/docs-index.js
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,11 @@ export default class DocsIndexController extends Controller {
} else {
categories = categories.sort((a, b) => {
const first = this.site.categories
.findBy("id", a.id)
.find((item) => item.id === a.id)
.name.toLowerCase(),
second = this.site.categories.findBy("id", b.id).name.toLowerCase();
second = this.site.categories
.find((item) => item.id === b.id)
?.name.toLowerCase();
return first.localeCompare(second);
});
}
Expand All @@ -94,7 +96,9 @@ export default class DocsIndexController extends Controller {

if (this.showCategoryFilter) {
return categories.filter((category) => {
let categoryData = this.site.categories.findBy("id", category.id);
let categoryData = this.site.categories.find(
(item) => item.id === category.id
);
return (
categoryData.name.toLowerCase().indexOf(filter.toLowerCase()) > -1 ||
(categoryData.description_excerpt &&
Expand Down Expand Up @@ -278,7 +282,10 @@ export default class DocsIndexController extends Controller {

return this.siteSettings.docs_categories
.split("|")
.map((c) => this.site.categories.findBy("id", parseInt(c, 10))?.name)
.map(
(c) =>
this.site.categories.find((item) => item.id === parseInt(c, 10))?.name
Comment thread
megothss marked this conversation as resolved.
)
.filter(Boolean);
}

Expand Down
7 changes: 3 additions & 4 deletions assets/javascripts/discourse/routes/docs-index.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,9 @@ export default class DocsIndex extends DiscourseRoute {
const pageTitle = i18n("docs.title");
if (model.topic.title && model.topic.category_id) {
const title = model.topic.unicode_title || model.topic.title;
const categoryName = this.site.categories.findBy(
"id",
model.topic.category_id
).name;
const categoryName = this.site.categories.find(
(item) => item.id === model.topic.category_id
)?.name;
return `${title} - ${categoryName} - ${pageTitle}`;
} else {
return pageTitle;
Expand Down