Skip to content

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

FIX: Return `false` from `hasBlock` for undecorated classes (#44335)

Sérgio Saquetimfa3745f888a2
diff --git a/frontend/discourse/app/lib/blocks/-internals/registry/block.ts b/frontend/discourse/app/lib/blocks/-internals/registry/block.ts
index 63e4cb6b63a..9faa261ce83 100644
--- a/frontend/discourse/app/lib/blocks/-internals/registry/block.ts
+++ b/frontend/discourse/app/lib/blocks/-internals/registry/block.ts
@@ -74,13 +74,13 @@ export function isBlockRegistryFrozen(): boolean {
* @param nameOrClass - Block name string or BlockClass.
* @returns True if the block is registered.
*/
-export function hasBlock(nameOrClass: string | BlockClass) {
+export function hasBlock(nameOrClass: string | BlockClass): boolean {
if (typeof nameOrClass === "string") {
return blockRegistry.has(nameOrClass);
}
const metadata: BlockMetadata | null = getBlockMetadata(nameOrClass);
const blockName = metadata?.blockName;
- return blockName && blockRegistry.has(blockName);
+ return blockName !== undefined && blockRegistry.has(blockName);
}
/**
diff --git a/frontend/discourse/tests/unit/lib/blocks/core/registration-test.js b/frontend/discourse/tests/unit/lib/blocks/core/registration-test.js
index 37099cfa4a9..7aa4e9fe4b4 100644
--- a/frontend/discourse/tests/unit/lib/blocks/core/registration-test.js
+++ b/frontend/discourse/tests/unit/lib/blocks/core/registration-test.js
@@ -232,6 +232,12 @@ module("Unit | Lib | blocks/core/registration", function (hooks) {
test("returns false for unregistered name", function (assert) {
assert.false(hasBlock("unregistered-block"));
});
+
+ test("returns false for a class that was never decorated", function (assert) {
+ class NeverDecoratedBlock {}
+
+ assert.false(hasBlock(NeverDecoratedBlock));
+ });
});
module("isBlockResolved", function () {