Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DEV: Modernize getOwner usage in `discourse/components` (#23674) 

See 8958b4f76a for motivation
This commit is contained in:
David Taylor 2023-09-26 18:21:51 +01:00 committed by GitHub
parent a673004777
commit dd0bbb189d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 21 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/app/components/bulk-select-toggle.js
View File

@ -1,11 +1,11 @@
import Component from "@glimmer/component"; import Component from "@glimmer/component";
import { action } from "@ember/object"; import { action } from "@ember/object";
import { getOwnerWithFallback } from "discourse-common/lib/get-owner"; import { getOwner } from "@ember/application";
export default class BulkSelectToggle extends Component { export default class BulkSelectToggle extends Component {
@action @action
toggleBulkSelect() { toggleBulkSelect() {
const controller = getOwnerWithFallback(this).lookup( const controller = getOwner(this).lookup(
`controller:${this.args.parentController}` `controller:${this.args.parentController}`
); );
const helper = controller.bulkSelectHelper; const helper = controller.bulkSelectHelper;

4
app/assets/javascripts/discourse/app/components/composer-editor.js
View File

@ -42,7 +42,7 @@ import {
initUserStatusHtml, initUserStatusHtml,
renderUserStatusHtml, renderUserStatusHtml,
} from "discourse/lib/user-status-on-autocomplete"; } from "discourse/lib/user-status-on-autocomplete";
import { getOwnerWithFallback } from "discourse-common/lib/get-owner"; import { getOwner } from "@ember/application";
// original string `![image|foo=bar|690x220, 50%|bar=baz](upload://1TjaobgKObzpU7xRMw2HuUc87vO.png "image title")` // original string `![image|foo=bar|690x220, 50%|bar=baz](upload://1TjaobgKObzpU7xRMw2HuUc87vO.png "image title")`
// group 1 `image|foo=bar` // group 1 `image|foo=bar`
@ -224,7 +224,7 @@ export default Component.extend(ComposerUploadUppy, {
categoryId: this.topic?.category_id || this.composer?.categoryId, categoryId: this.topic?.category_id || this.composer?.categoryId,
includeGroups: true, includeGroups: true,
}).then((result) => { }).then((result) => {
initUserStatusHtml(getOwnerWithFallback(this), result.users); initUserStatusHtml(getOwner(this), result.users);
return result; return result;
}); });
}, },

6
app/assets/javascripts/discourse/app/components/composer-message.js
View File

@ -1,16 +1,14 @@
import Component from "@ember/component"; import Component from "@ember/component";
import deprecated from "discourse-common/lib/deprecated"; import deprecated from "discourse-common/lib/deprecated";
import discourseComputed from "discourse-common/utils/decorators"; import discourseComputed from "discourse-common/utils/decorators";
import { getOwnerWithFallback } from "discourse-common/lib/get-owner"; import { getOwner } from "@ember/application";
export default Component.extend({ export default Component.extend({
classNameBindings: [":composer-popup", "message.extraClass"], classNameBindings: [":composer-popup", "message.extraClass"],
@discourseComputed("message.templateName") @discourseComputed("message.templateName")
layout(templateName) { layout(templateName) {
return getOwnerWithFallback(this).lookup( return getOwner(this).lookup(`template:composer/${templateName}`);
`template:composer/${templateName}`
);
}, },
actions: { actions: {

4
app/assets/javascripts/discourse/app/components/custom-html.js
View File

@ -1,6 +1,6 @@
import Component from "@ember/component"; import Component from "@ember/component";
import { getCustomHTML } from "discourse/helpers/custom-html"; import { getCustomHTML } from "discourse/helpers/custom-html";
import { getOwnerWithFallback } from "discourse-common/lib/get-owner"; import { getOwner } from "@ember/application";
import { hbs } from "ember-cli-htmlbars"; import { hbs } from "ember-cli-htmlbars";
import deprecated from "discourse-common/lib/deprecated"; import deprecated from "discourse-common/lib/deprecated";
@ -16,7 +16,7 @@ export default Component.extend({
this.set("html", html); this.set("html", html);
this.set("layout", hbs`{{this.html}}`); this.set("layout", hbs`{{this.html}}`);
} else { } else {
const template = getOwnerWithFallback(this).lookup(`template:${name}`); const template = getOwner(this).lookup(`template:${name}`);
if (template) { if (template) {
deprecated( deprecated(
"Defining an hbs template for CustomHTML rendering is deprecated. Use plugin outlets instead.", "Defining an hbs template for CustomHTML rendering is deprecated. Use plugin outlets instead.",

6
app/assets/javascripts/discourse/app/components/d-navigation.js
View File

@ -3,7 +3,7 @@ import { filterTypeForMode } from "discourse/lib/filter-mode";
import NavItem from "discourse/models/nav-item"; import NavItem from "discourse/models/nav-item";
import discourseComputed from "discourse-common/utils/decorators"; import discourseComputed from "discourse-common/utils/decorators";
import { NotificationLevels } from "discourse/lib/notification-levels"; import { NotificationLevels } from "discourse/lib/notification-levels";
import { getOwnerWithFallback } from "discourse-common/lib/get-owner"; import { getOwner } from "@ember/application";
import { htmlSafe } from "@ember/template"; import { htmlSafe } from "@ember/template";
import { inject as service } from "@ember/service"; import { inject as service } from "@ember/service";
import { tracked } from "@glimmer/tracking"; import { tracked } from "@glimmer/tracking";
@ -144,9 +144,7 @@ export default Component.extend({
@discourseComputed() @discourseComputed()
canBulk() { canBulk() {
const controller = getOwnerWithFallback(this).lookup( const controller = getOwner(this).lookup("controller:discovery/topics");
"controller:discovery/topics"
);
return controller.canBulkSelect; return controller.canBulkSelect;
}, },

5
app/assets/javascripts/discourse/app/components/modal/share-topic.js
View File

@ -11,7 +11,7 @@ import showModal from "discourse/lib/show-modal";
import { bufferedProperty } from "discourse/mixins/buffered-content"; import { bufferedProperty } from "discourse/mixins/buffered-content";
import I18n from "I18n"; import I18n from "I18n";
import Category from "discourse/models/category"; import Category from "discourse/models/category";
import { getOwnerWithFallback } from "discourse-common/lib/get-owner"; import { getOwner } from "@ember/application";
const ShareTopicModal = Component.extend(bufferedProperty("invite"), { const ShareTopicModal = Component.extend(bufferedProperty("invite"), {
topic: readOnly("model.topic"), topic: readOnly("model.topic"),
@ -108,8 +108,7 @@ const ShareTopicModal = Component.extend(bufferedProperty("invite"), {
const postStream = this.topic.postStream; const postStream = this.topic.postStream;
const postId = this.post?.id || postStream.findPostIdForPostNumber(1); const postId = this.post?.id || postStream.findPostIdForPostNumber(1);
const post = postStream.findLoadedPost(postId); const post = postStream.findLoadedPost(postId);
const topicController = const topicController = getOwner(this).lookup("controller:topic");
getOwnerWithFallback(this).lookup("controller:topic");
topicController.actions.replyAsNewTopic.call(topicController, post); topicController.actions.replyAsNewTopic.call(topicController, post);
this.closeModal(); this.closeModal();
}, },

6
app/assets/javascripts/discourse/app/components/modal/topic-bulk-actions.js
View File

@ -9,7 +9,7 @@ import ChangeCategory from "../bulk-actions/change-category";
import NotificationLevel from "../bulk-actions/notification-level"; import NotificationLevel from "../bulk-actions/notification-level";
import ChangeTags from "../bulk-actions/change-tags"; import ChangeTags from "../bulk-actions/change-tags";
import AppendTags from "../bulk-actions/append-tags"; import AppendTags from "../bulk-actions/append-tags";
import { getOwnerWithFallback } from "discourse-common/lib/get-owner"; import { getOwner } from "@ember/application";
const _customButtons = []; const _customButtons = [];
@ -72,7 +72,7 @@ export default class TopicBulkActions extends Component {
class: "btn-default", class: "btn-default",
visible: ({ topics }) => topics.some((t) => t.isPrivateMessage), visible: ({ topics }) => topics.some((t) => t.isPrivateMessage),
action: ({ performAndRefresh }) => { action: ({ performAndRefresh }) => {
const userPrivateMessages = getOwnerWithFallback(this).lookup( const userPrivateMessages = getOwner(this).lookup(
"controller:user-private-messages" "controller:user-private-messages"
); );
let params = { type: "archive_messages" }; let params = { type: "archive_messages" };
@ -90,7 +90,7 @@ export default class TopicBulkActions extends Component {
class: "btn-default", class: "btn-default",
visible: ({ topics }) => topics.some((t) => t.isPrivateMessage), visible: ({ topics }) => topics.some((t) => t.isPrivateMessage),
action: ({ performAndRefresh }) => { action: ({ performAndRefresh }) => {
const userPrivateMessages = getOwnerWithFallback(this).lookup( const userPrivateMessages = getOwner(this).lookup(
"controller:user-private-messages" "controller:user-private-messages"
); );
let params = { type: "move_messages_to_inbox" }; let params = { type: "move_messages_to_inbox" };

4
app/assets/javascripts/discourse/app/components/reviewable-item.js
View File

@ -9,7 +9,7 @@ import { popupAjaxError } from "discourse/lib/ajax-error";
import { action, set } from "@ember/object"; import { action, set } from "@ember/object";
import showModal from "discourse/lib/show-modal"; import showModal from "discourse/lib/show-modal";
import { inject as service } from "@ember/service"; import { inject as service } from "@ember/service";
import { getOwnerWithFallback } from "discourse-common/lib/get-owner"; import { getOwner } from "@ember/application";
import ExplainReviewableModal from "discourse/components/modal/explain-reviewable"; import ExplainReviewableModal from "discourse/components/modal/explain-reviewable";
let _components = {}; let _components = {};
@ -121,7 +121,7 @@ export default Component.extend({
} }
const dasherized = dasherize(type); const dasherized = dasherize(type);
const owner = getOwnerWithFallback(this); const owner = getOwner(this);
const componentExists = const componentExists =
owner.hasRegistration(`component:${dasherized}`) || owner.hasRegistration(`component:${dasherized}`) ||
owner.hasRegistration(`template:components/${dasherized}`); owner.hasRegistration(`template:components/${dasherized}`);

5
app/assets/javascripts/discourse/app/components/sidebar/user/messages-section.js
View File

@ -1,6 +1,6 @@
import { cached } from "@glimmer/tracking"; import { cached } from "@glimmer/tracking";
import { getOwnerWithFallback } from "discourse-common/lib/get-owner"; import { getOwner } from "@ember/application";
import Component from "@glimmer/component"; import Component from "@glimmer/component";
import { bind } from "discourse-common/utils/decorators"; import { bind } from "discourse-common/utils/decorators";
import GroupMessageSectionLink from "discourse/lib/sidebar/user/messages-section/group-message-section-link"; import GroupMessageSectionLink from "discourse/lib/sidebar/user/messages-section/group-message-section-link";
@ -85,8 +85,7 @@ export default class SidebarUserMessagesSection extends Component {
}; };
if (currentRouteParentName === "topic") { if (currentRouteParentName === "topic") {
const topicController = const topicController = getOwner(this).lookup("controller:topic");
getOwnerWithFallback(this).lookup("controller:topic");
if (topicController.model.isPrivateMessage) { if (topicController.model.isPrivateMessage) {
attrs.privateMessageTopic = topicController.model; attrs.privateMessageTopic = topicController.model;

4
app/assets/javascripts/discourse/app/components/user-menu/menu.js
View File

@ -15,7 +15,7 @@ import UserMenuReviewablesList from "./reviewables-list";
import UserMenuProfileTabContent from "./profile-tab-content"; import UserMenuProfileTabContent from "./profile-tab-content";
import UserMenuOtherNotificationsList from "./other-notifications-list"; import UserMenuOtherNotificationsList from "./other-notifications-list";
import deprecated from "discourse-common/lib/deprecated"; import deprecated from "discourse-common/lib/deprecated";
import { getOwnerWithFallback } from "discourse-common/lib/get-owner"; import { getOwner } from "@ember/application";
const DEFAULT_TAB_ID = "all-notifications"; const DEFAULT_TAB_ID = "all-notifications";
const DEFAULT_PANEL_COMPONENT = UserMenuNotificationsList; const DEFAULT_PANEL_COMPONENT = UserMenuNotificationsList;
@ -281,7 +281,7 @@ export default class UserMenu extends Component {
this.currentTabId = tab.id; this.currentTabId = tab.id;
this.currentPanelComponent = resolvePanelComponent( this.currentPanelComponent = resolvePanelComponent(
getOwnerWithFallback(this), getOwner(this),
tab.panelComponent tab.panelComponent
); );