@umbraco-cms/backoffice 14.0.0--preview004-a38abfe4 → 14.0.0--preview004-54914695

package/dist-cms/apps/backoffice/backoffice.context.d.ts

@@ -1,6 +1,6 @@
 import { UmbContextToken } from '../../libs/context-api/index.js';
 import { UmbExtensionManifestInitializer } from '../../libs/extension-api/index.js';
-import { UmbControllerHost } from '../../libs/controller-api/index.js';
+import type { UmbControllerHost } from '../../libs/controller-api/index.js';
 import { ManifestSection } from '../../packages/core/extension-registry/index.js';
 export declare class UmbBackofficeContext {
     #private;

package/dist-cms/apps/backoffice/backoffice.context.js

@@ -1,6 +1,6 @@
 import { UmbContextToken } from '../../libs/context-api/index.js';
 import { UmbBasicState, UmbStringState } from '../../libs/observable-api/index.js';
-import { UmbExtensionsManifestController } from '../../libs/extension-api/index.js';
+import { UmbExtensionsManifestInitializer } from '../../libs/extension-api/index.js';
 import { umbExtensionsRegistry } from '../../packages/core/extension-registry/index.js';
 export class UmbBackofficeContext {
     #activeSectionAlias;
@@ -12,7 +12,7 @@ export class UmbBackofficeContext {
         // TODO: We need a class array state:
         this.#allowedSections = new UmbBasicState([]);
         this.allowedSections = this.#allowedSections.asObservable();
-        new UmbExtensionsManifestController(host, umbExtensionsRegistry, 'section', null, (sections) => {
+        new UmbExtensionsManifestInitializer(host, umbExtensionsRegistry, 'section', null, (sections) => {
             this.#allowedSections.next([...sections]);
         });
     }

package/dist-cms/apps/backoffice/components/backoffice-main.element.js

@@ -7,7 +7,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 import { UMB_BACKOFFICE_CONTEXT_TOKEN } from '../backoffice.context.js';
 import { css, html, customElement, state } from '../../../external/lit/index.js';
 import { UmbSectionContext, UMB_SECTION_CONTEXT_TOKEN } from '../../../packages/core/section/index.js';
-import { createExtensionElement, } from '../../../libs/extension-api/index.js';
+import { createExtensionElement } from '../../../libs/extension-api/index.js';
 import { UmbLitElement } from '../../../shared/lit-element/index.js';
 export let UmbBackofficeMainElement = class UmbBackofficeMainElement extends UmbLitElement {
     constructor() {

package/dist-cms/apps/backoffice/server-extension-registrator.controller.d.ts

@@ -1,7 +1,6 @@
-import { UmbBaseController, UmbControllerHost } from '../../libs/controller-api/index.js';
+import { UmbBaseController, type UmbControllerHost } from '../../libs/controller-api/index.js';
 import { UmbBackofficeExtensionRegistry } from '../../packages/core/extension-registry/index.js';
 export declare class UmbServerExtensionRegistrator extends UmbBaseController {
     #private;
     constructor(host: UmbControllerHost, extensionRegistry: UmbBackofficeExtensionRegistry);
-    private isManifestBase;
 }

package/dist-cms/apps/backoffice/server-extension-registrator.controller.js

@@ -1,16 +1,14 @@
 import { PackageResource, OpenAPI } from '../../external/backend-api/index.js';
 import { UmbBaseController } from '../../libs/controller-api/index.js';
 import { tryExecuteAndNotify } from '../../shared/resources/index.js';
-import { isManifestJSType } from '../../libs/extension-api/index.js';
+import { isManifestBaseType } from '../../libs/extension-api/index.js';
 // TODO: consider if this can be replaced by the new extension controllers
-// TODO: move local part out of this, and name something with server.
 export class UmbServerExtensionRegistrator extends UmbBaseController {
     #extensionRegistry;
     #apiBaseUrl = OpenAPI.BASE;
     constructor(host, extensionRegistry) {
         super(host, UmbServerExtensionRegistrator.name);
         this.#extensionRegistry = extensionRegistry;
-        // TODO: This was before in hostConnected(), but I don't see the reason to wait. lets just do it right away.
         this.#loadServerPackages();
     }
     async #loadServerPackages() {
@@ -21,7 +19,7 @@ export class UmbServerExtensionRegistrator extends UmbBaseController {
 
             This code is copy pasted from the package repository. We probably don't need this is the package repository anymore.
         */
-        const { data: packages } = await tryExecuteAndNotify(this._host, PackageResource.getPackageManifest());
+        const { data: packages } = await tryExecuteAndNotify(this, PackageResource.getPackageManifest());
         if (packages) {
             // Append packages to the store but only if they have a name
             //store.appendItems(packages.filter((p) => p.name?.length));
@@ -30,16 +28,23 @@ export class UmbServerExtensionRegistrator extends UmbBaseController {
                 p.extensions?.forEach((e) => {
                     // Crudely validate that the extension at least follows a basic manifest structure
                     // Idea: Use `Zod` to validate the manifest
-                    if (this.isManifestBase(e)) {
+                    if (isManifestBaseType(e)) {
                         /**
                          * Crude check to see if extension is of type "js" since it is safe to assume we do not
                          * need to load any other types of extensions in the backoffice (we need a js file to load)
                          */
-                        if (isManifestJSType(e)) {
-                            // Add API base url if the js path is relative
-                            if (!e.js.startsWith('http')) {
-                                e.js = `${this.#apiBaseUrl}${e.js}`;
-                            }
+                        // TODO: add helper to check for relative paths
+                        // Add base url if the js path is relative
+                        if ('js' in e && typeof e.js === 'string' && !e.js.startsWith('http')) {
+                            e.js = `${this.#apiBaseUrl}${e.js}`;
+                        }
+                        // Add base url if the element path is relative
+                        if ('element' in e && typeof e.element === 'string' && !e.element.startsWith('http')) {
+                            e.element = `${this.#apiBaseUrl}${e.element}`;
+                        }
+                        // Add base url if the element path api relative
+                        if ('api' in e && typeof e.api === 'string' && !e.api.startsWith('http')) {
+                            e.api = `${this.#apiBaseUrl}${e.api}`;
                         }
                         extensions.push(e);
                     }
@@ -48,7 +53,4 @@ export class UmbServerExtensionRegistrator extends UmbBaseController {
             this.#extensionRegistry.registerMany(extensions);
         }
     }
-    isManifestBase(x) {
-        return typeof x === 'object' && x !== null && 'alias' in x;
-    }
 }

package/dist-cms/custom-elements.json

@@ -2893,18 +2893,12 @@
     {
       "name": "umb-confirm-modal",
       "path": "./../src/packages/core/modal/common/confirm/confirm-modal.element.ts",
-      "attributes": [
-        {
-          "name": "data"
-        }
-      ],
       "properties": [
         {
           "name": "modalContext"
         },
         {
-          "name": "data",
-          "attribute": "data"
+          "name": "data"
         },
         {
           "name": "styles",
@@ -3134,29 +3128,6 @@
         }
       ]
     },
-    {
-      "name": "umb-property-action",
-      "path": "./../src/packages/core/property-action/shared/property-action/property-action.element.ts",
-      "attributes": [
-        {
-          "name": "propertyAction"
-        }
-      ],
-      "properties": [
-        {
-          "name": "propertyAction",
-          "attribute": "propertyAction"
-        },
-        {
-          "name": "styles",
-          "default": "[\"UmbTextStyles\"]"
-        },
-        {
-          "name": "value",
-          "type": "unknown"
-        }
-      ]
-    },
     {
       "name": "umb-property-editor-ui-block-grid-block-configuration",
       "path": "./../src/packages/core/property-editor/uis/block-grid/config/block-configuration/property-editor-ui-block-grid-block-configuration.element.ts",
@@ -3175,9 +3146,7 @@
           "default": "\"\""
         },
         {
-          "name": "config",
-          "type": "never[]",
-          "default": "[]"
+          "name": "config"
         },
         {
           "name": "styles",
@@ -3204,9 +3173,7 @@
           "default": "\"\""
         },
         {
-          "name": "config",
-          "type": "never[]",
-          "default": "[]"
+          "name": "config"
         },
         {
           "name": "styles",
@@ -3233,9 +3200,7 @@
           "default": "\"\""
         },
         {
-          "name": "config",
-          "type": "never[]",
-          "default": "[]"
+          "name": "config"
         },
         {
           "name": "styles",
@@ -3313,9 +3278,7 @@
           "default": "\"\""
         },
         {
-          "name": "config",
-          "type": "never[]",
-          "default": "[]"
+          "name": "config"
         },
         {
           "name": "styles",
@@ -3400,9 +3363,7 @@
           "default": "\"\""
         },
         {
-          "name": "config",
-          "type": "never[]",
-          "default": "[]"
+          "name": "config"
         },
         {
           "name": "styles",
@@ -3429,9 +3390,7 @@
           "default": "\"\""
         },
         {
-          "name": "config",
-          "type": "never[]",
-          "default": "[]"
+          "name": "config"
         },
         {
           "name": "styles",
@@ -3458,9 +3417,7 @@
           "default": "\"\""
         },
         {
-          "name": "config",
-          "type": "never[]",
-          "default": "[]"
+          "name": "config"
         },
         {
           "name": "styles",
@@ -3487,9 +3444,7 @@
           "default": "\"\""
         },
         {
-          "name": "config",
-          "type": "never[]",
-          "default": "[]"
+          "name": "config"
         },
         {
           "name": "styles",
@@ -3517,8 +3472,7 @@
         },
         {
           "name": "config",
-          "type": "never[]",
-          "default": "[]"
+          "type": "UmbPropertyEditorConfigCollection | undefined"
         },
         {
           "name": "styles",
@@ -4366,14 +4320,16 @@
       "attributes": [
         {
           "name": "value",
-          "type": "number | undefined"
+          "type": "number",
+          "default": "0"
         }
       ],
       "properties": [
         {
           "name": "value",
           "attribute": "value",
-          "type": "number | undefined"
+          "type": "number",
+          "default": "0"
         },
         {
           "name": "styles",
@@ -4400,9 +4356,7 @@
           "default": "[]"
         },
         {
-          "name": "config",
-          "type": "never[]",
-          "default": "[]"
+          "name": "config"
         },
         {
           "name": "stylesheetList",
@@ -4528,6 +4482,9 @@
           "name": "value",
           "attribute": "value"
         },
+        {
+          "name": "config"
+        },
         {
           "name": "styles",
           "type": "array",
@@ -5077,11 +5034,6 @@
           "name": "enforceNoFooter",
           "type": "boolean",
           "default": "false"
-        },
-        {
-          "name": "alias",
-          "description": "Alias of the workspace. Currently not used for anything.",
-          "type": "string | undefined"
         }
       ],
       "properties": [
@@ -5103,12 +5055,6 @@
           "type": "boolean",
           "default": "false"
         },
-        {
-          "name": "alias",
-          "attribute": "alias",
-          "description": "Alias of the workspace. Currently not used for anything.",
-          "type": "string | undefined"
-        },
         {
           "name": "styles",
           "type": "array",
@@ -6140,6 +6086,9 @@
       "name": "umb-document-workspace",
       "path": "./../src/packages/documents/documents/workspace/document-workspace.element.ts",
       "properties": [
+        {
+          "name": "manifest"
+        },
         {
           "name": "styles",
           "type": "array",
@@ -7648,9 +7597,7 @@
           "default": "\"\""
         },
         {
-          "name": "config",
-          "type": "never[]",
-          "default": "[]"
+          "name": "config"
         },
         {
           "name": "styles",

package/dist-cms/libs/context-api/consume/context-consumer.d.ts

@@ -16,7 +16,7 @@ export declare class UmbContextConsumer<BaseType = unknown, ResultType extends B
      * @memberof UmbContextConsumer
      */
     constructor(hostElement: EventTarget, contextAlias: string | UmbContextToken<BaseType, ResultType>, callback?: UmbContextCallback<ResultType>);
-    protected _onResponse: (instance: BaseType) => void;
+    protected _onResponse: (instance: BaseType) => boolean;
     protected setInstance(instance: ResultType): void;
     asPromise(): Promise<ResultType>;
     /**

package/dist-cms/libs/context-api/consume/context-consumer.js

@@ -27,24 +27,22 @@ export class UmbContextConsumer {
      */
     constructor(hostElement, contextAlias, callback) {
         this.hostElement = hostElement;
-        /* Idea: Niels: If we need to filter for specific contexts, we could make the response method return true/false. If false, the event should then then not be stopped. Alternatively parse the event it self on to the response-callback.
-        This will enable the event to continue to bubble up finding a context that matches.
-        The reason for such would be to have some who are more specific than others. For example, some might just need the current workspace-context, others might need the closest handling a certain entityType.
-        As I'm writing this is not relevant, but I wanted to keep the idea as we have had some circumstance that might be solved with this approach.
-        */
         this._onResponse = (instance) => {
             if (this.#instance === instance) {
-                return;
+                return false;
             }
             if (this.#discriminator) {
                 // Notice if discriminator returns false, we do not want to setInstance.
                 if (this.#discriminator(instance)) {
                     this.setInstance(instance);
+                    return true;
                 }
             }
             else {
                 this.setInstance(instance);
+                return true;
             }
+            return false;
         };
         this.#handleNewProvider = (event) => {
             // Does seem a bit unnecessary, we could just assume the type via type casting...

package/dist-cms/libs/context-api/consume/context-request.event.d.ts

@@ -8,7 +8,7 @@ export type UmbContextCallback<T> = (instance: T) => void;
  */
 export interface UmbContextRequestEvent<ResultType = unknown> extends Event {
     readonly contextAlias: string | UmbContextToken<unknown, ResultType>;
-    readonly callback: UmbContextCallback<ResultType>;
+    readonly callback: (context: ResultType) => boolean;
 }
 /**
  * @export
@@ -18,10 +18,9 @@ export interface UmbContextRequestEvent<ResultType = unknown> extends Event {
  */
 export declare class UmbContextRequestEventImplementation<ResultType = unknown> extends Event implements UmbContextRequestEvent<ResultType> {
     readonly contextAlias: string | UmbContextToken<any, ResultType>;
-    readonly callback: UmbContextCallback<ResultType>;
-    constructor(contextAlias: string | UmbContextToken<any, ResultType>, callback: UmbContextCallback<ResultType>);
+    readonly callback: (context: ResultType) => boolean;
+    constructor(contextAlias: string | UmbContextToken<any, ResultType>, callback: (context: ResultType) => boolean);
 }
-export declare const isUmbContextRequestEvent: (event: Event) => event is UmbContextRequestEventImplementation<unknown>;
 export declare class UmbContextDebugRequest extends Event {
     readonly callback: any;
     constructor(callback: any);

package/dist-cms/libs/context-api/consume/context-request.event.js

@@ -13,9 +13,6 @@ export class UmbContextRequestEventImplementation extends Event {
         this.callback = callback;
     }
 }
-export const isUmbContextRequestEvent = (event) => {
-    return event.type === umbContextRequestEventType;
-};
 export class UmbContextDebugRequest extends Event {
     constructor(callback) {
         super(umbDebugContextEventType, { bubbles: true, composed: true, cancelable: false });

package/dist-cms/libs/context-api/provide/context-provider.controller.js

@@ -1,18 +1,23 @@
 import { UmbContextProvider } from './context-provider.js';
 export class UmbContextProviderController extends UmbContextProvider {
     #host;
+    #controllerAlias;
     get controllerAlias() {
-        return this._contextAlias.toString();
+        return this.#controllerAlias;
     }
     constructor(host, contextAlias, instance) {
         super(host.getHostElement(), contextAlias, instance);
         this.#host = host;
+        // Makes the controllerAlias unique for this instance, this enables multiple Contexts to be provided under the same name. (This only makes sense cause of Context Token Discriminators)
+        // This does mean that if someone provides a context with the same name, but with a different instance, it will not override the previous instance. But its good since it enables extensions to provide contexts at the same scope of other contexts.
+        this.#controllerAlias = contextAlias.toString() + '_' + instance.constructor?.name;
         // If this API is already provided with this alias? Then we do not want to register this controller:
         const existingControllers = host.getControllers((x) => x.controllerAlias === this.controllerAlias);
         if (existingControllers.length > 0 &&
             existingControllers[0].providerInstance?.() === instance) {
+            // This just an additional awareness feature to make devs Aware, the alternative would be adding it anyway, but that would destroy existing controller of this alias.
             // Back out, this instance is already provided, by another controller.
-            throw new Error(`Context API: The context of '${this.controllerAlias}' is already provided with the same API by another Context Provider Controller.`);
+            throw new Error(`Context API: The context of '${this.controllerAlias}' and instance '${instance.constructor?.name ?? 'unnamed'}' is already provided by another Context Provider Controller.`);
         }
         else {
             host.addController(this);

package/dist-cms/libs/context-api/provide/context-provider.js

@@ -1,4 +1,4 @@
-import { umbContextRequestEventType, isUmbContextRequestEvent, umbDebugContextEventType, } from '../consume/context-request.event.js';
+import { umbContextRequestEventType, umbDebugContextEventType, } from '../consume/context-request.event.js';
 import { UmbContextProvideEventImplementation,
 //UmbContextUnprovidedEventImplementation,
  } from './context-provide.event.js';
@@ -29,14 +29,16 @@ export class UmbContextProvider {
          * @param {UmbContextRequestEvent} event
          * @memberof UmbContextProvider
          */
-        this.#handleContextRequest = (event) => {
-            if (!isUmbContextRequestEvent(event))
-                return;
+        this.#handleContextRequest = ((event) => {
             if (event.contextAlias !== this._contextAlias)
                 return;
+            // Since the alias matches, we will stop it from bubbling further up. But we still allow it to ask the other Contexts of the element. Hence not calling `event.stopImmediatePropagation();`
             event.stopPropagation();
-            event.callback(this.#instance);
-        };
+            if (event.callback(this.#instance)) {
+                // Make sure the event not hits any more Contexts as we have found a match.
+                event.stopImmediatePropagation();
+            }
+        });
         this._handleDebugContextRequest = (event) => {
             // If the event doesn't have an instances property, create it.
             if (!event.instances) {

package/dist-cms/libs/controller-api/controller-host-base.mixin.d.ts

@@ -1,4 +1,4 @@
-import { ClassConstructor } from '../extension-api/types.js';
+import { ClassConstructor } from '../extension-api/types/utils.js';
 import { UmbControllerHost } from './controller-host.interface.js';
 import type { UmbController } from './controller.interface.js';
 declare class UmbControllerHostBaseDeclaration implements Omit<UmbControllerHost, 'getHostElement'> {
@@ -18,5 +18,5 @@ declare class UmbControllerHostBaseDeclaration implements Omit<UmbControllerHost
  * @param {Object} superClass - superclass to be extended.
  * @mixin
  */
-export declare const UmbControllerHostBaseMixin: <T extends ClassConstructor<any>>(superClass: T) => ClassConstructor<UmbControllerHostBaseDeclaration> & T;
+export declare const UmbControllerHostBaseMixin: <T extends ClassConstructor>(superClass: T) => ClassConstructor<UmbControllerHostBaseDeclaration> & T;
 export {};

package/dist-cms/libs/controller-api/controller-host-base.mixin.js

@@ -37,8 +37,12 @@ export const UmbControllerHostBaseMixin = (superClass) => {
             this.#controllers.push(ctrl);
             if (this.#attached) {
                 // If a controller is created on a already attached element, then it will be added directly. This might not be optimal. As the controller it self has not finished its constructor method jet. therefor i postpone the call:
-                Promise.resolve().then(() => ctrl.hostConnected());
-                //ctrl.hostConnected();
+                Promise.resolve().then(() => {
+                    // Extra check to see if we are still attached at this point:
+                    if (this.#attached) {
+                        ctrl.hostConnected();
+                    }
+                });
             }
         }
         /**
@@ -72,14 +76,20 @@ export const UmbControllerHostBaseMixin = (superClass) => {
         }
         hostConnected() {
             this.#attached = true;
+            // Note: this might not be optimal, as if hostDisconnected remove one of the controllers, then the next controller will be skipped.
             this.#controllers.forEach((ctrl) => ctrl.hostConnected());
         }
         hostDisconnected() {
             this.#attached = false;
+            // Note: this might not be optimal, as if hostDisconnected remove one of the controllers, then the next controller will be skipped.
             this.#controllers.forEach((ctrl) => ctrl.hostDisconnected());
         }
         destroy() {
-            this.#controllers.forEach((ctrl) => ctrl.destroy());
+            let ctrl;
+            // Note: A very important way of doing this loop, as foreach will skip over the next item if the current item is removed.
+            while ((ctrl = this.#controllers[0])) {
+                ctrl.destroy();
+            }
             this.#controllers.length = 0;
         }
     }

package/dist-cms/libs/controller-api/controller-host-element.mixin.d.ts

@@ -1,7 +1,7 @@
-import type { HTMLElementConstructor } from '../extension-api/types.js';
 import type { UmbControllerAlias } from './controller-alias.type.js';
 import type { UmbControllerHost } from './controller-host.interface.js';
 import type { UmbController } from './controller.interface.js';
+import { HTMLElementConstructor } from '../extension-api/index.js';
 export declare class UmbControllerHostElement extends HTMLElement implements UmbControllerHost {
     hasController(controller: UmbController): boolean;
     getControllers(filterMethod: (ctrl: UmbController) => boolean): UmbController[];

package/dist-cms/libs/controller-api/controller-host-provider.element.d.ts

@@ -1,5 +1,5 @@
 import { UmbControllerHostElement } from './controller-host-element.mixin.js';
-declare const UmbControllerHostProviderElement_base: import("../extension-api/types.js").HTMLElementConstructor<UmbControllerHostElement> & {
+declare const UmbControllerHostProviderElement_base: import("../extension-api/index.js").HTMLElementConstructor<UmbControllerHostElement> & {
     new (): HTMLElement;
     prototype: HTMLElement;
 };

package/dist-cms/libs/extension-api/condition/condition-controller-arguments.type.d.ts

@@ -1,4 +1,4 @@
-import type { UmbConditionConfigBase } from '../types.js';
+import { UmbConditionConfigBase } from '../types/index.js';
 import type { UmbControllerHost } from '../../controller-api/index.js';
 export type UmbConditionControllerArguments<ConditionConfigType extends UmbConditionConfigBase = UmbConditionConfigBase> = {
     host: UmbControllerHost;

package/dist-cms/libs/extension-api/condition/extension-condition.interface.d.ts

@@ -1,4 +1,4 @@
-import type { UmbConditionConfigBase } from '../types.js';
+import type { UmbConditionConfigBase } from '../types/index.js';
 import { UmbController } from '../../controller-api/index.js';
 export interface UmbExtensionCondition extends UmbController {
     readonly permitted: boolean;

package/dist-cms/libs/extension-api/controller/base-extension-initializer.controller.d.ts

@@ -1,8 +1,16 @@
 import { UmbBaseController, type UmbControllerHost } from '../../controller-api/index.js';
 import { type ManifestCondition, type ManifestWithDynamicConditions, type UmbExtensionRegistry } from '../index.js';
+/**
+ * This abstract Controller holds the core to manage a single Extension.
+ * When the extension is permitted to be used, then the extender of this class can instantiate what is relevant for this type and thereby make it available for the consumer.
+ *
+ * @export
+ * @abstract
+ * @class UmbBaseExtensionInitializer
+ */
 export declare abstract class UmbBaseExtensionInitializer<ManifestType extends ManifestWithDynamicConditions = ManifestWithDynamicConditions, SubClassType = never> extends UmbBaseController {
     #private;
-    protected _positive?: boolean;
+    protected _isConditionsPositive?: boolean;
     get weight(): number;
     get permitted(): boolean;
     get manifest(): ManifestType | undefined;