@umbraco-cms/backoffice 14.0.0--preview006-2af5bef5 → 14.0.0--preview006-6f482919

package/dist-cms/custom-elements.json

@@ -10613,24 +10613,13 @@
     {
       "name": "umb-router-slot",
       "path": "./../src/shared/router/router-slot.element.ts",
-      "attributes": [
-        {
-          "name": "routes",
-          "type": "UmbRoute[] | undefined"
-        },
-        {
-          "name": "parent"
-        }
-      ],
       "properties": [
         {
           "name": "routes",
-          "attribute": "routes",
           "type": "UmbRoute[] | undefined"
         },
         {
-          "name": "parent",
-          "attribute": "parent"
+          "name": "parent"
         },
         {
           "name": "absoluteRouterPath",
@@ -10668,13 +10657,6 @@
         {
           "name": "variantId",
           "type": "UmbVariantId[]"
-        },
-        {
-          "name": "routes",
-          "type": "UmbRoute[] | undefined"
-        },
-        {
-          "name": "parent"
         }
       ],
       "properties": [
@@ -10685,12 +10667,10 @@
         },
         {
           "name": "routes",
-          "attribute": "routes",
           "type": "UmbRoute[] | undefined"
         },
         {
-          "name": "parent",
-          "attribute": "parent"
+          "name": "parent"
         },
         {
           "name": "absoluteRouterPath",

package/dist-cms/mocks/data/document/document.data.js

@@ -87,7 +87,7 @@ export const data = [
                 alias: 'multiNodeTreePicker',
                 culture: null,
                 segment: null,
-                value: null,
+                value: 'all-property-editors-document-id,c05da24d-7740-447b-9cdc-bd8ce2172e38,fd56a0b5-01a0-4da2-b428-52773bfa9cc4',
             },
             {
                 alias: 'datePicker',

package/dist-cms/packages/block/block-list/components/inline-list-block/inline-list-block.element.js

@@ -42,7 +42,7 @@ let UmbInlineListBlockElement = class UmbInlineListBlockElement extends UmbLitEl
                 __classPrivateFieldGet(this, _UmbInlineListBlockElement_instances, "m", _UmbInlineListBlockElement_load).call(this);
             }, 'observeContentUdi');
         });
-        this.observe(umbExtensionsRegistry.getByTypeAndAlias('workspace', UMB_BLOCK_WORKSPACE_ALIAS), (manifest) => {
+        this.observe(umbExtensionsRegistry.byTypeAndAlias('workspace', UMB_BLOCK_WORKSPACE_ALIAS), (manifest) => {
             if (manifest) {
                 createExtensionApi(manifest, [this, { manifest: manifest }]).then((context) => {
                     if (context) {

package/dist-cms/packages/core/collection/collection.element.js

@@ -42,7 +42,7 @@ _UmbCollectionElement_instances = new WeakSet();
 _UmbCollectionElement_observeManifest = function _UmbCollectionElement_observeManifest() {
     if (!this._alias)
         return;
-    this.observe(umbExtensionsRegistry.getByTypeAndAlias('collection', this._alias), async (manifest) => {
+    this.observe(umbExtensionsRegistry.byTypeAndAlias('collection', this._alias), async (manifest) => {
         if (!manifest)
             return;
         __classPrivateFieldSet(this, _UmbCollectionElement_manifest, manifest, "f");

package/dist-cms/packages/core/components/backoffice-modal-container/backoffice-modal-container.element.js

@@ -53,7 +53,7 @@ _UmbBackofficeModalContainerElement_createModalElements = function _UmbBackoffic
         this._modalElementMap.delete(modal.key);
     });
     if (this._modals.length === 0) {
-        this._modalElementMap.clear();
+        //this._modalElementMap.clear(); // should not make a difference now that we clean it above. [NL]
         return;
     }
     this._modals.forEach((modal) => {

package/dist-cms/packages/core/content-type/components/property-type-based-property/property-type-based-property.element.js

@@ -35,7 +35,7 @@ let UmbPropertyTypeBasedPropertyElement = class UmbPropertyTypeBasedPropertyElem
                 // If there is no UI, we will look up the Property editor model to find the default UI alias:
                 if (!this._propertyEditorUiAlias && dataType?.editorAlias) {
                     //use 'dataType.editorAlias' to look up the extension in the registry:
-                    this.observe(umbExtensionsRegistry.getByTypeAndAlias('propertyEditorSchema', dataType.editorAlias), (extension) => {
+                    this.observe(umbExtensionsRegistry.byTypeAndAlias('propertyEditorSchema', dataType.editorAlias), (extension) => {
                         if (!extension)
                             return;
                         this._propertyEditorUiAlias = extension?.meta.defaultPropertyEditorUiAlias;

package/dist-cms/packages/core/data-type/workspace/data-type-workspace.context.js

@@ -14,7 +14,7 @@ import { UmbDataTypeDetailRepository } from '../repository/detail/data-type-deta
 import { UmbEditableWorkspaceContextBase, UmbInvariantWorkspacePropertyDatasetContext, } from '../../workspace/index.js';
 import { appendToFrozenArray, UmbArrayState, UmbObjectState, UmbStringState, } from '../../../../libs/observable-api/index.js';
 import { combineLatest, map } from '../../../../external/rxjs/index.js';
-import { umbExtensionsRegistry, } from '../../extension-registry/index.js';
+import { umbExtensionsRegistry } from '../../extension-registry/index.js';
 import { UMB_PROPERTY_EDITOR_SCHEMA_ALIAS_DEFAULT } from '../../property-editor/index.js';
 export class UmbDataTypeWorkspaceContext extends UmbEditableWorkspaceContextBase {
     constructor(host) {
@@ -221,13 +221,13 @@ _UmbDataTypeWorkspaceContext_data = new WeakMap(), _UmbDataTypeWorkspaceContext_
         await __classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_instances, "m", _UmbDataTypeWorkspaceContext_setPropertyEditorSchemaConfig).call(this, propertyEditorSchemaAlias);
     }).asPromise();
 }, _UmbDataTypeWorkspaceContext_setPropertyEditorSchemaConfig = function _UmbDataTypeWorkspaceContext_setPropertyEditorSchemaConfig(propertyEditorSchemaAlias) {
-    return this.observe(umbExtensionsRegistry.getByTypeAndAlias('propertyEditorSchema', propertyEditorSchemaAlias), (manifest) => {
+    return this.observe(umbExtensionsRegistry.byTypeAndAlias('propertyEditorSchema', propertyEditorSchemaAlias), (manifest) => {
         this._propertyEditorSchemaConfigProperties = manifest?.meta.settings?.properties || [];
         this._propertyEditorSchemaConfigDefaultData = manifest?.meta.settings?.defaultData || [];
         this._propertyEditorSchemaConfigDefaultUIAlias = manifest?.meta.defaultPropertyEditorUiAlias || null;
     }).asPromise();
 }, _UmbDataTypeWorkspaceContext_setPropertyEditorUIConfig = function _UmbDataTypeWorkspaceContext_setPropertyEditorUIConfig(propertyEditorUIAlias) {
-    return this.observe(umbExtensionsRegistry.getByTypeAndAlias('propertyEditorUi', propertyEditorUIAlias), (manifest) => {
+    return this.observe(umbExtensionsRegistry.byTypeAndAlias('propertyEditorUi', propertyEditorUIAlias), (manifest) => {
         __classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_propertyEditorUiIcon, "f").setValue(manifest?.meta.icon || null);
         __classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_propertyEditorUiName, "f").setValue(manifest?.name || null);
         this._propertyEditorUISettingsSchemaAlias = manifest?.meta.propertyEditorSchemaAlias;

package/dist-cms/packages/core/modal/modal.element.js

@@ -126,7 +126,7 @@ _UmbModalElement_createDialogElement = function _UmbModalElement_createDialogEle
 };
 _UmbModalElement_observeModal = function _UmbModalElement_observeModal(alias) {
     __classPrivateFieldGet(this, _UmbModalElement_modalExtensionObserver, "f")?.destroy();
-    this.observe(umbExtensionsRegistry.getByTypeAndAlias('modal', alias), async (manifest) => {
+    this.observe(umbExtensionsRegistry.byTypeAndAlias('modal', alias), async (manifest) => {
         __classPrivateFieldGet(this, _UmbModalElement_instances, "m", _UmbModalElement_removeInnerElement).call(this);
         if (manifest) {
             const innerElement = await __classPrivateFieldGet(this, _UmbModalElement_instances, "m", _UmbModalElement_createInnerElement).call(this, manifest);

package/dist-cms/packages/core/property/property/property.element.js

@@ -106,7 +106,7 @@ let UmbPropertyElement = class UmbPropertyElement extends UmbLitElement {
         });
     }
     _observePropertyEditorUI() {
-        this.observe(umbExtensionsRegistry.getByTypeAndAlias('propertyEditorUi', this._propertyEditorUiAlias), (manifest) => {
+        this.observe(umbExtensionsRegistry.byTypeAndAlias('propertyEditorUi', this._propertyEditorUiAlias), (manifest) => {
             this._gotEditorUI(manifest);
         }, '_observePropertyEditorUI');
     }

package/dist-cms/packages/core/tree/tree.context.js

@@ -102,7 +102,7 @@ _UmbTreeContextBase_treeRoot = new WeakMap(), _UmbTreeContextBase_treeAlias = ne
     }
 }, _UmbTreeContextBase_observeTreeManifest = function _UmbTreeContextBase_observeTreeManifest() {
     if (__classPrivateFieldGet(this, _UmbTreeContextBase_treeAlias, "f")) {
-        this.observe(umbExtensionsRegistry.getByTypeAndAlias('tree', __classPrivateFieldGet(this, _UmbTreeContextBase_treeAlias, "f")), async (treeManifest) => {
+        this.observe(umbExtensionsRegistry.byTypeAndAlias('tree', __classPrivateFieldGet(this, _UmbTreeContextBase_treeAlias, "f")), async (treeManifest) => {
             if (!treeManifest)
                 return;
             __classPrivateFieldGet(this, _UmbTreeContextBase_instances, "m", _UmbTreeContextBase_observeRepository).call(this, treeManifest);

package/dist-cms/packages/documents/documents/components/input-document/input-document.element.js

@@ -121,7 +121,6 @@ _UmbInputDocumentElement_pickableFilter = new WeakMap();
 _UmbInputDocumentElement_instances = new WeakSet();
 _UmbInputDocumentElement_openPicker = function _UmbInputDocumentElement_openPicker() {
     // TODO: Configure the content picker, with `startNodeId` and `ignoreUserStartNodes` [LK]
-    console.log('#openPicker', [this.startNodeId, this.ignoreUserStartNodes]);
     __classPrivateFieldGet(this, _UmbInputDocumentElement_pickerContext, "f").openPicker({
         hideTreeRoot: true,
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment

package/dist-cms/packages/media/media/components/input-media/input-media.element.js

@@ -124,7 +124,6 @@ _UmbInputMediaElement_pickableFilter = new WeakMap();
 _UmbInputMediaElement_instances = new WeakSet();
 _UmbInputMediaElement_openPicker = function _UmbInputMediaElement_openPicker() {
     // TODO: Configure the media picker, with `allowedContentTypeIds` and `ignoreUserStartNodes` [LK]
-    console.log('#openPicker', [this.allowedContentTypeIds, this.ignoreUserStartNodes]);
     __classPrivateFieldGet(this, _UmbInputMediaElement_pickerContext, "f").openPicker({
         hideTreeRoot: true,
         pickableFilter: __classPrivateFieldGet(this, _UmbInputMediaElement_pickableFilter, "f"),

package/dist-cms/shared/router/route.context.js

@@ -108,8 +108,10 @@ _UmbRouteContext_mainRouter = new WeakMap(), _UmbRouteContext_modalRouter = new
         },
     };
 }, _UmbRouteContext_removeModalPath = function _UmbRouteContext_removeModalPath(info) {
-    if (window.location.href.includes(info.match.fragments.consumed)) {
-        window.history.pushState({}, '', window.location.href.split(info.match.fragments.consumed)[0]);
+    // Reset the URL to the routerBasePath + routerActiveLocalPath
+    const folderToRemove = info.match.match.input;
+    if (folderToRemove && window.location.href.includes(folderToRemove)) {
+        window.history.pushState({}, '', __classPrivateFieldGet(this, _UmbRouteContext_routerBasePath, "f") + '/' + __classPrivateFieldGet(this, _UmbRouteContext_routerActiveLocalPath, "f"));
     }
 }, _UmbRouteContext_generateModalRoutes = function _UmbRouteContext_generateModalRoutes() {
     const newModals = __classPrivateFieldGet(this, _UmbRouteContext_modalRegistrations, "f").filter((x) => !__classPrivateFieldGet(this, _UmbRouteContext_modalRoutes, "f").find((route) => x.key === route.__modalKey));

package/dist-cms/shared/router/router-slot.element.js

@@ -136,10 +136,10 @@ UmbRouterSlotElement.styles = [
 		`,
 ];
 __decorate([
-    property()
+    property({ attribute: false })
 ], UmbRouterSlotElement.prototype, "routes", null);
 __decorate([
-    property()
+    property({ attribute: false })
 ], UmbRouterSlotElement.prototype, "parent", null);
 UmbRouterSlotElement = __decorate([
     customElement('umb-router-slot')