Skip to content

A platform for community discussion. Free, open, simple.

DEV: Avoid `{{component}}` helper for plugin-supplied components (#42518)

David Taylora69002956e0b
diff --git a/frontend/discourse/app/components/modal/bulk-topic-actions.gjs b/frontend/discourse/app/components/modal/bulk-topic-actions.gjs
index 9156cef44de..1deb0bee113 100644
--- a/frontend/discourse/app/components/modal/bulk-topic-actions.gjs
+++ b/frontend/discourse/app/components/modal/bulk-topic-actions.gjs
@@ -549,15 +549,14 @@ export default class BulkTopicActions extends Component {
{{/if}}
{{#if this.activeComponent}}
- {{component
- this.activeComponent
- onRegisterAction=this.registerCustomAction
- setSubmitDisabled=this.setSubmitDisabled
- topics=this.activeComponentProps.topics
- afterBulkAction=this.activeComponentProps.afterBulkAction
- categoryId=this.activeComponentProps.categoryId
- onPerform=this.activeComponentProps.onPerform
- }}
+ <this.activeComponent
+ @onRegisterAction={{this.registerCustomAction}}
+ @setSubmitDisabled={{this.setSubmitDisabled}}
+ @topics={{this.activeComponentProps.topics}}
+ @afterBulkAction={{this.activeComponentProps.afterBulkAction}}
+ @categoryId={{this.activeComponentProps.categoryId}}
+ @onPerform={{this.activeComponentProps.onPerform}}
+ />
{{/if}}
{{#if this.isPinAction}}
diff --git a/frontend/discourse/app/components/sidebar/api-section.gjs b/frontend/discourse/app/components/sidebar/api-section.gjs
index 7611cbee773..32a64f5bb2b 100644
--- a/frontend/discourse/app/components/sidebar/api-section.gjs
+++ b/frontend/discourse/app/components/sidebar/api-section.gjs
@@ -1,3 +1,5 @@
+import { hash } from "@ember/helper";
+import curryComponent from "ember-curry-component";
import { and, eq, not } from "discourse/truth-helpers";
import Section from "./section";
import SectionLink from "./section-link";
@@ -53,9 +55,11 @@ const SidebarApiSection = <template>
@didInsert={{link.didInsert}}
@willDestroy={{link.willDestroy}}
@content={{link.text}}
- @contentComponent={{component
+ @contentComponent={{if
link.contentComponent
- status=link.contentComponentArgs
+ (curryComponent
+ link.contentComponent (hash status=link.contentComponentArgs)
+ )
}}
@suffixComponent={{link.suffixComponent}}
@suffixArgs={{link.suffixArgs}}