IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-25 10:20:58 -06:00
Code Issues Packages Projects Releases Wiki Activity

DEV: Replace Category.findById with Category.asyncFindByIds in easy cases (#26270)

Browse Source
This commit is contained in:
Daniel Waterworth 2024-04-05 11:59:10 -05:00 committed by GitHub
parent 1df97e86c1
commit cafdc29806
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 37 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/discourse-common/addon/utils/multi-cache.js
View File

@ -22,6 +22,7 @@ export class MultiCache {
this.fetchTimes = [this.fetchTimes[this.fetchTimes.length - 1], new Date()];
const notFound = [];
ids = ids.uniq();
for (const id of ids) {
if (!this.values.has(id)) {

41
app/assets/javascripts/discourse/app/components/modal/history.js
View File

@ -190,26 +190,27 @@ export default class History extends Component {
);
}
revert(post, postVersion) {
post
.revertToRevision(postVersion)
.then((result) => {
this.refresh(post.id, postVersion);
if (result.topic) {
post.set("topic.slug", result.topic.slug);
post.set("topic.title", result.topic.title);
post.set("topic.fancy_title", result.topic.fancy_title);
}
if (result.category_id) {
post.set("topic.category", Category.findById(result.category_id));
}
this.args.closeModal();
})
.catch((e) => {
if (e.jqXHR.responseJSON?.errors?.[0]) {
this.dialog.alert(e.jqXHR.responseJSON.errors[0]);
}
});
async revert(post, postVersion) {
try {
const result = await post.revertToRevision(postVersion);
this.refresh(post.id, postVersion);
if (result.topic) {
post.set("topic.slug", result.topic.slug);
post.set("topic.title", result.topic.title);
post.set("topic.fancy_title", result.topic.fancy_title);
}
if (result.category_id) {
post.set(
"topic.category",
await Category.asyncFindById(result.category_id)
);
}
this.args.closeModal();
} catch (e) {
if (e.jqXHR.responseJSON?.errors?.[0]) {
this.dialog.alert(e.jqXHR.responseJSON.errors[0]);
}
}
}
get editButtonLabel() {

4
app/assets/javascripts/discourse/app/models/category.js
View File

@ -157,6 +157,10 @@ export default class Category extends RestModel {
return categories;
}
static async asyncFindById(id) {
return (await Category.asyncFindByIds([id]))[0];
}
static findBySlugAndParent(slug, parentCategory) {
if (this.slugEncoded()) {
slug = encodeURI(slug);

19
app/assets/javascripts/discourse/app/models/group.js
View File

@ -450,7 +450,7 @@ export default class Group extends RestModel {
});
}
findPosts(opts) {
async findPosts(opts) {
opts = opts || {};
const type = opts.type || "posts";
const data = {};
@ -463,13 +463,16 @@ export default class Group extends RestModel {
data.category_id = parseInt(opts.categoryId, 10);
}
return ajax(`/groups/${this.name}/${type}.json`, { data }).then((posts) => {
return posts.map((p) => {
p.user = User.create(p.user);
p.topic = Topic.create(p.topic);
p.category = Category.findById(p.category_id);
return EmberObject.create(p);
});
const posts = await ajax(`/groups/${this.name}/${type}.json`, { data });
const categories = await Category.asyncFindByIds(
posts.map((p) => p.category_id)
);
return posts.map((p) => {
p.user = User.create(p.user);
p.topic = Topic.create(p.topic);
p.category = categories[p.category_id];
return EmberObject.create(p);
});
}