Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DEV: Resolve a compatibility issue in core with CustomHtml component #54

Merged
merged 2 commits into from
Mar 13, 2024
Merged

DEV: Resolve a compatibility issue in core with CustomHtml component #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6283490
DEV: Resolve a compatibility issue in core with CustomHtml component
Arkshine Mar 12, 2024
0c6c1c2
Minor naming change
pmusaraj Mar 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 11 additions & 1 deletion javascripts/discourse/components/right-sidebar-blocks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@ import Component from "@glimmer/component";
import { getOwner } from "@ember/application";
import { tracked } from "@glimmer/tracking";

const componentNameOverrides = {
// avoids name collision with core's custom-html component
"custom-html": "custom-html-rsb",
};

export default class RightSidebarBlocks extends Component {
@tracked blocks = [];

Expand All @@ -11,7 +16,12 @@ export default class RightSidebarBlocks extends Component {
const blocksArray = [];

JSON.parse(settings.blocks).forEach((block) => {
if (getOwner(this).hasRegistration(`component:${block.name}`)) {
block.internalName =
block.name in componentNameOverrides
? componentNameOverrides[block.name]
: block.name;

if (getOwner(this).hasRegistration(`component:${block.internalName}`)) {
block.classNames = `rs-component rs-${block.name}`;
block.parsedParams = {};
if (block.params) {
Expand Down
0 ...urse/templates/components/custom-html.hbs → .../templates/components/custom-html-rsb.hbs
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion javascripts/discourse/templates/components/right-sidebar-blocks.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

{{#each blocks as |block|}}
<div class={{block.classNames}}>
{{component block.name params=block.parsedParams}}
{{component block.internalName params=block.parsedParams}}
</div>
<PluginOutlet
@name="below-right-sidebar-block"
Expand Down