yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

base extension controller updates when kind arrive

Browse Source
This commit is contained in:
Niels Lyngsø
2023-07-27 22:23:27 +02:00
parent 4a5fff5aa2
commit 801f586e67
2 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/base-extension-controller.test.ts
View File

@@ -361,7 +361,6 @@ describe('UmbBaseExtensionController', () => {
expect(extensionController.manifest?.weight).to.be.undefined;
expect(extensionController.manifest?.conditions?.length).to.be.equal(0);
} else if (count === 2) {
console.log('Kind change was tricked');
// Second time render, there is a matching kind and then weight is 123.
expect(extensionController.manifest?.weight).to.be.equal(123);
expect(extensionController.manifest?.conditions?.length).to.be.equal(0);
@@ -374,7 +373,6 @@ describe('UmbBaseExtensionController', () => {
);
extensionController.asPromise().then(() => {
initialPromiseResolved = true;
console.log('Was resolved.');
Promise.resolve().then(() => {
extensionRegistry.register(lateComingKind);
});

47
src/Umbraco.Web.UI.Client/src/libs/extension-api/registry/extension.registry.ts
View File

@@ -1,3 +1,4 @@
import { of, switchMap } from 'rxjs';
import type { ManifestTypeMap, ManifestBase, SpecificManifestTypeOrManifestBase, ManifestKind } from '../types.js';
import { UmbBasicState } from '@umbraco-cms/backoffice/observable-api';
import { map, Observable, distinctUntilChanged, combineLatest } from '@umbraco-cms/backoffice/external/rxjs';
@@ -178,29 +179,33 @@ export class UmbExtensionRegistry<
}
getByAlias<T extends ManifestBase = ManifestBase>(alias: string) {
return combineLatest([
this.extensions.pipe(
map((exts) => exts.find((ext) => ext.alias === alias)),
distinctUntilChanged(extensionSingleMemoization)
),
]).pipe(
map(([ext]) => {
// Specific Extension Meta merge (does not merge conditions)
if (ext) {
// Since we dont have the type up front in this request, we will just get all kinds here and find the matching one:
const baseManifest = this._kinds
.getValue()
.find((kind) => kind.matchType === ext.type && kind.matchKind === ext.kind)?.manifest;
if (baseManifest) {
const merged = { isMatchedWithKind: true, ...baseManifest, ...ext } as any;
if ((baseManifest as any).meta) {
merged.meta = { ...(baseManifest as any).meta, ...(ext as any).meta };
}
return merged;
}
return this.extensions.pipe(
map((exts) => exts.find((ext) => ext.alias === alias)),
distinctUntilChanged(extensionSingleMemoization),
switchMap((ext) => {
if (ext?.kind) {
return this._kindsOfType(ext.type).pipe(
map((kinds) => {
// Specific Extension Meta merge (does not merge conditions)
if (ext) {
// Since we dont have the type up front in this request, we will just get all kinds here and find the matching one:
const baseManifest = kinds.find((kind) => kind.matchKind === ext.kind)?.manifest;
// TODO: This check can go away when making a find kind based on type and kind.
if (baseManifest) {
const merged = { isMatchedWithKind: true, ...baseManifest, ...ext } as any;
if ((baseManifest as any).meta) {
merged.meta = { ...(baseManifest as any).meta, ...(ext as any).meta };
}
return merged;
}
}
return ext;
})
);
}
return ext;
return of(ext);
}),
distinctUntilChanged(extensionAndKindMatchSingleMemoization)
) as Observable<T | undefined>;
}