IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

DEV: Remove category-macro (#24395)

Browse Source 
This discourse-common decorator was dependent on the core app, hence creating a circular reference that was breaking the embroider upgrade. (see: #24391)
This commit is contained in:
Jarek Radosz 2023-11-16 00:16:19 +01:00 committed by GitHub
parent 6ce55e5347
commit e56005b783
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/discourse-common/addon/utils/category-macro.js
View File

@ -1,8 +0,0 @@
import { computed, get } from "@ember/object";
import Category from "discourse/models/category";
export default function categoryFromId(property) {
return computed(property, function () {
return Category.findById(get(this, property));
});
}

7
app/assets/javascripts/discourse/app/models/bookmark.js
View File

@ -10,9 +10,9 @@ import RestModel from "discourse/models/rest";
import Topic from "discourse/models/topic";
import User from "discourse/models/user";
import getURL from "discourse-common/lib/get-url";
import categoryFromId from "discourse-common/utils/category-macro";
import discourseComputed from "discourse-common/utils/decorators";
import I18n from "discourse-i18n";
import Category from "./category";
export const AUTO_DELETE_PREFERENCES = {
NEVER: 0,
@ -125,7 +125,10 @@ const Bookmark = RestModel.extend({
return newTags;
},
category: categoryFromId("category_id"),
@computed("category_id")
get category() {
return Category.findById(this.category_id);
},
@discourseComputed("reminder_at", "currentUser")
formattedReminder(bookmarkReminderAt, currentUser) {

7
app/assets/javascripts/discourse/app/models/pending-post.js
View File

@ -2,8 +2,8 @@ import { reads } from "@ember/object/computed";
import { cook } from "discourse/lib/text";
import { userPath } from "discourse/lib/url";
import RestModel from "discourse/models/rest";
import categoryFromId from "discourse-common/utils/category-macro";
import discourseComputed from "discourse-common/utils/decorators";
import Category from "./category";
const PendingPost = RestModel.extend({
expandedExcerpt: null,
@ -22,7 +22,10 @@ const PendingPost = RestModel.extend({
return userPath(username.toLowerCase());
},
category: categoryFromId("category_id"),
@discourseComputed("category_id")
category() {
return Category.findById(this.category_id);
},
});
export default PendingPost;

7
app/assets/javascripts/discourse/app/models/reviewable.js
View File

@ -2,9 +2,9 @@ import { dasherize, underscore } from "@ember/string";
import { Promise } from "rsvp";
import { ajax } from "discourse/lib/ajax";
import RestModel from "discourse/models/rest";
import categoryFromId from "discourse-common/utils/category-macro";
import discourseComputed from "discourse-common/utils/decorators";
import I18n from "discourse-i18n";
import Category from "./category";
export const PENDING = 0;
export const APPROVED = 1;
@ -68,7 +68,10 @@ const Reviewable = RestModel.extend({
});
},
category: categoryFromId("category_id"),
@discourseComputed("category_id")
category() {
return Category.findById(this.category_id);
},
update(updates) {
// If no changes, do nothing

7
app/assets/javascripts/discourse/app/models/topic.js
View File

@ -20,9 +20,9 @@ import { flushMap } from "discourse/services/store";
import deprecated from "discourse-common/lib/deprecated";
import getURL from "discourse-common/lib/get-url";
import { deepMerge } from "discourse-common/lib/object";
import categoryFromId from "discourse-common/utils/category-macro";
import discourseComputed from "discourse-common/utils/decorators";
import I18n from "discourse-i18n";
import Category from "./category";
export function loadTopicView(topic, args) {
const data = deepMerge({}, args);
@ -213,7 +213,10 @@ const Topic = RestModel.extend({
return { type: "topic", id };
},
category: categoryFromId("category_id"),
@discourseComputed("category_id")
category() {
return Category.findById(this.category_id);
},
@discourseComputed("url")
shareUrl(url) {

7
app/assets/javascripts/discourse/app/models/user-action.js
View File

@ -4,8 +4,8 @@ import { postUrl } from "discourse/lib/utilities";
import RestModel from "discourse/models/rest";
import User from "discourse/models/user";
import UserActionGroup from "discourse/models/user-action-group";
import categoryFromId from "discourse-common/utils/category-macro";
import discourseComputed from "discourse-common/utils/decorators";
import Category from "./category";
const UserActionTypes = {
likes_given: 1,
@ -27,7 +27,10 @@ Object.keys(UserActionTypes).forEach(
);
const UserAction = RestModel.extend({
category: categoryFromId("category_id"),
@discourseComputed("category_id")
category() {
return Category.findById(this.category_id);
},
@discourseComputed("action_type")
descriptionKey(action) {