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

FIX: Allow connector template names to be camelCase (#17371) 

The default Ember resolver implementation allows this for components. We need the same for connectors (which are essentially components behind-the-scenes)
This commit is contained in:
David Taylor 2022-07-07 12:42:23 +01:00 committed by GitHub
parent 5b0a8bfbcb
commit d037796ff4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/assets/javascripts/discourse-common/addon/resolver.js
View File

@ -80,7 +80,17 @@ export function buildResolver(baseName) {
}
}
let normalized = super._normalize(fullName);
const split = fullName.split(":");
const type = split[0];
let normalized;
if (type === "template" && split[1]?.includes("connectors/")) {
// The default normalize implementation will skip dasherizing component template names
// We need the same for our connector templates names
normalized = "template:" + split[1].replace(/_/g, "-");
} else {
normalized = super._normalize(fullName);
}
// This is code that we don't really want to keep long term. The main situation where we need it is for
// doing stuff like `controllerFor('adminWatchedWordsAction')` where the real route name
@ -88,8 +98,6 @@ export function buildResolver(baseName) {
// normalize to `adminWatchedWordsAction` where the latter becomes `adminWatchedWords.action`.
// While these end up looking up the same file ultimately, they are treated as different
// items and so we can end up with two distinct version of the controller!
const split = fullName.split(":");
const type = split[0];
if (
split.length > 1 &&
(type === "controller" || type === "route" || type === "template")

20
app/assets/javascripts/discourse/tests/unit/ember/resolver-test.js
View File

@ -480,7 +480,11 @@ module("Unit | Ember | resolver", function (hooks) {
});
test("resolves connector templates", function (assert) {
setTemplates(["javascripts/foo", "javascripts/connectors/foo-bar/baz_qux"]);
setTemplates([
"javascripts/foo",
"javascripts/connectors/foo-bar/baz_qux",
"javascripts/connectors/foo-bar/camelCase",
]);
lookupTemplate(
assert,
@ -502,6 +506,20 @@ module("Unit | Ember | resolver", function (hooks) {
"javascripts/connectors/foo-bar/baz_qux",
"underscores last segment"
);
lookupTemplate(
assert,
"template:connectors/foo-bar/camelCase",
"javascripts/connectors/foo-bar/camelCase",
"handles camelcase file names"
);
lookupTemplate(
assert,
resolver.normalize("template:connectors/foo-bar/camelCase"),
"javascripts/connectors/foo-bar/camelCase",
"handles camelcase file names when normalized"
);
});
test("returns 'not_found' template when template name cannot be resolved", function (assert) {