@umbraco-cms/backoffice 17.0.0-rc1 → 17.0.0-rc2

package/dist-cms/external/openid/src/redirect_based_handler.d.ts

@@ -15,6 +15,12 @@ export declare class RedirectRequestHandler extends AuthorizationRequestHandler
     locationLike: LocationLike;
     constructor(storageBackend?: StorageBackend, utils?: BasicQueryStringUtils, locationLike?: LocationLike, crypto?: Crypto);
     performAuthorizationRequest(configuration: AuthorizationServiceConfiguration, request: AuthorizationRequest): Promise<string>;
+    /**
+     * Cleanup all stale authorization requests and configurations from storage.
+     * This scans localStorage for any keys matching the appauth patterns and removes them,
+     * including the authorization request handle key.
+     */
+    cleanupStaleAuthorizationData(): Promise<void>;
     /**
      * Attempts to introspect the contents of storage backend and completes the
      * request.

package/dist-cms/external/openid/src/redirect_based_handler.js

@@ -61,6 +61,35 @@ export class RedirectRequestHandler extends AuthorizationRequestHandler {
             return url;
         });
     }
+    /**
+     * Cleanup all stale authorization requests and configurations from storage.
+     * This scans localStorage for any keys matching the appauth patterns and removes them,
+     * including the authorization request handle key.
+     */
+    cleanupStaleAuthorizationData() {
+        // Check if we're in a browser environment with localStorage
+        if (typeof window === 'undefined' || !window.localStorage) {
+            return Promise.resolve();
+        }
+        const keysToRemove = [];
+        // Scan localStorage for all appauth-related keys
+        for (let i = 0; i < window.localStorage.length; i++) {
+            const key = window.localStorage.key(i);
+            if (key &&
+                (key.includes('_appauth_authorization_request') ||
+                    key.includes('_appauth_authorization_service_configuration') ||
+                    key === AUTHORIZATION_REQUEST_HANDLE_KEY)) {
+                keysToRemove.push(key);
+            }
+        }
+        // Remove all found stale keys
+        const removePromises = keysToRemove.map((key) => this.storageBackend.removeItem(key));
+        return Promise.all(removePromises).then(() => {
+            if (keysToRemove.length > 0) {
+                log(`Cleaned up ${keysToRemove.length} stale authorization data entries`);
+            }
+        });
+    }
     /**
      * Attempts to introspect the contents of storage backend and completes the
      * request.
@@ -103,12 +132,8 @@ export class RedirectRequestHandler extends AuthorizationRequestHandler {
                         else {
                             authorizationResponse = new AuthorizationResponse({ code: code, state: state });
                         }
-                        // cleanup state
-                        return Promise.all([
-                            this.storageBackend.removeItem(AUTHORIZATION_REQUEST_HANDLE_KEY),
-                            this.storageBackend.removeItem(authorizationRequestKey(handle)),
-                            this.storageBackend.removeItem(authorizationServiceConfigurationKey(handle)),
-                        ]).then(() => {
+                        // cleanup all authorization data including current and stale entries
+                        return this.cleanupStaleAuthorizationData().then(() => {
                             log('Delivering authorization response');
                             return {
                                 request: request,
@@ -119,7 +144,10 @@ export class RedirectRequestHandler extends AuthorizationRequestHandler {
                     }
                     else {
                         log('Mismatched request (state and request_uri) dont match.');
-                        return Promise.resolve(null);
+                        // cleanup all authorization data even on mismatch to prevent stale PKCE data
+                        return this.cleanupStaleAuthorizationData().then(() => {
+                            return null;
+                        });
                     }
                 }));
             }

package/dist-cms/packages/block/block/workspace/views/edit/block-workspace-view-edit-content-no-router.element.js

@@ -16,13 +16,11 @@ import { UmbLitElement } from '../../../../../core/lit-element/index.js';
  * A specific view for editing content in a block workspace placed inline within a block view/element.
  */
 let UmbBlockWorkspaceViewEditContentNoRouterElement = class UmbBlockWorkspaceViewEditContentNoRouterElement extends UmbLitElement {
-    //@state()
-    //private _activeTabName?: string | null | undefined;
     #blockWorkspace;
     #tabsStructureHelper;
     constructor() {
         super();
-        //private _hasRootProperties = false;
+        // private _hasRootProperties = false;
         this._hasRootGroups = false;
         this.#tabsStructureHelper = new UmbContentTypeContainerStructureHelper(this);
         this.#tabsStructureHelper.setIsRoot(true);
@@ -49,20 +47,18 @@ let UmbBlockWorkspaceViewEditContentNoRouterElement = class UmbBlockWorkspaceVie
     #checkDefaultTabName() {
         if (!this._tabs || !this.#blockWorkspace)
             return;
-        // Find the default tab to grab:
+        // Find the default tab to grab
         if (this._activeTabKey === undefined) {
             if (this._hasRootGroups) {
-                //this._activeTabName = null;
                 this._activeTabKey = null;
             }
             else if (this._tabs.length > 0) {
-                //this._activeTabName = this._tabs[0].name;
-                this._activeTabKey = this._tabs[0].key;
+                const tab = this._tabs[0];
+                this._activeTabKey = tab.ownerId ?? tab.ids[0];
             }
         }
     }
-    #setTabName(tabName, tabKey) {
-        //this._activeTabName = tabName;
+    #setTabKey(tabKey) {
         this._activeTabKey = tabKey;
     }
     render() {
@@ -70,22 +66,21 @@ let UmbBlockWorkspaceViewEditContentNoRouterElement = class UmbBlockWorkspaceVie
             return;
         return html `
 			${this._tabs.length > 1 || (this._tabs.length === 1 && this._hasRootGroups)
-            ? html ` <uui-tab-group slot="header">
+            ? html `<uui-tab-group slot="header">
 						${this._hasRootGroups && this._tabs.length > 0
-                ? html `
-									<uui-tab
-										label="Content"
-										.active=${null === this._activeTabKey}
-										@click=${() => this.#setTabName(null, null)}
-										>Content</uui-tab
-									>
-								`
+                ? html `<uui-tab
+									label=${this.localize.term('general_generic')}
+									.active=${this._activeTabKey === null}
+									@click=${() => this.#setTabKey(null)}
+									>Content</uui-tab
+								>`
                 : nothing}
 						${repeat(this._tabs, (tab) => tab.name, (tab) => {
+                const tabKey = tab.ownerId ?? tab.ids[0];
                 return html `<uui-tab
-									label=${tab.name ?? 'Unnamed'}
-									.active=${tab.key === this._activeTabKey}
-									@click=${() => this.#setTabName(tab.name, tab.key)}
+									label=${this.localize.string(tab.name ?? '#general_unnamed')}
+									.active=${this._activeTabKey === tabKey}
+									@click=${() => this.#setTabKey(tabKey)}
 									>${tab.name}</uui-tab
 								>`;
             })}

package/dist-cms/packages/content/content/workspace/content-detail-workspace-base.js

@@ -265,6 +265,8 @@ export class UmbContentDetailWorkspaceContextBase extends UmbEntityDetailWorkspa
         const segments = this.structure.variesBySegment ? [] : undefined;
         const repo = new UmbDataTypeDetailRepository(this);
         const propertyTypes = await this.structure.getContentTypeProperties();
+        const contentTypeVariesByCulture = this.structure.getVariesByCulture();
+        const contentTypeVariesBySegment = this.structure.getVariesByCulture();
         const valueDefinitions = await Promise.all(propertyTypes.map(async (property) => {
             // TODO: Implement caching for data-type requests. [NL]
             const dataType = (await repo.requestByUnique(property.dataType.unique)).data;
@@ -281,8 +283,9 @@ export class UmbContentDetailWorkspaceContextBase extends UmbEntityDetailWorkspa
                 propertyEditorSchemaAlias: dataType.editorAlias,
                 config: dataType.values,
                 typeArgs: {
-                    variesByCulture: property.variesByCulture,
-                    variesBySegment: property.variesBySegment,
+                    // Only vary if the content type varies:
+                    variesByCulture: contentTypeVariesByCulture ? property.variesByCulture : false,
+                    variesBySegment: contentTypeVariesBySegment ? property.variesBySegment : false,
                 },
             };
         }));

package/dist-cms/packages/content/content-type/workspace/views/design/content-type-design-editor-properties.element.d.ts

@@ -14,7 +14,7 @@ export declare class UmbContentTypeDesignEditorPropertiesElement extends UmbLitE
     private _editPropertyTypePath?;
     private _sortModeActive?;
     constructor();
-    createPropertyTypeWorkspaceRoutes(): void;
+    disconnectedCallback(): void;
     render(): "" | import("lit-html").TemplateResult<1>;
     static styles: import("lit").CSSResult[];
 }

package/dist-cms/packages/content/content-type/workspace/views/design/content-type-design-editor-properties.element.js

@@ -39,7 +39,7 @@ let UmbContentTypeDesignEditorPropertiesElement = class UmbContentTypeDesignEdit
         if (value === this._containerId)
             return;
         this._containerId = value;
-        this.createPropertyTypeWorkspaceRoutes();
+        this.#createPropertyTypeWorkspaceRoutes();
         this.#propertyStructureHelper.setContainerId(value);
         this.#addPropertyModal?.setUniquePathValue('container-id', value === null ? 'root' : value);
         this.#editPropertyModal?.setUniquePathValue('container-id', value === null ? 'root' : value);
@@ -47,6 +47,9 @@ let UmbContentTypeDesignEditorPropertiesElement = class UmbContentTypeDesignEdit
     #addPropertyModal;
     #editPropertyModal;
     #propertyStructureHelper;
+    #initResolver;
+    #initReject;
+    #init;
     constructor() {
         super();
         this.#sorter = new UmbSorterController(this, {
@@ -123,6 +126,10 @@ let UmbContentTypeDesignEditorPropertiesElement = class UmbContentTypeDesignEdit
             },
         });
         this.#propertyStructureHelper = new UmbContentTypePropertyStructureHelper(this);
+        this.#init = new Promise((resolve, reject) => {
+            this.#initResolver = resolve;
+            this.#initReject = reject;
+        });
         this._properties = [];
         //this.#sorter.disable();
         this.consumeContext(UMB_CONTENT_TYPE_DESIGN_EDITOR_CONTEXT, (context) => {
@@ -135,20 +142,34 @@ let UmbContentTypeDesignEditorPropertiesElement = class UmbContentTypeDesignEdit
                 this.#propertyStructureHelper.setStructureManager(workspaceContext.structure);
             }
             this._ownerContentTypeUnique = workspaceContext?.structure.getOwnerContentTypeUnique();
-            this.createPropertyTypeWorkspaceRoutes();
-            this.observe(workspaceContext?.variesByCulture, (variesByCulture) => {
+            this.#createPropertyTypeWorkspaceRoutes();
+            const varyByCulturePromise = this.observe(workspaceContext?.variesByCulture, (variesByCulture) => {
                 this._ownerContentTypeVariesByCulture = variesByCulture;
-            }, 'observeOwnerVariesByCulture');
-            this.observe(workspaceContext?.variesBySegment, (variesBySegment) => {
+            }, 'observeOwnerVariesByCulture')?.asPromise();
+            const varyBySegmentPromise = this.observe(workspaceContext?.variesBySegment, (variesBySegment) => {
                 this._ownerContentTypeVariesBySegment = variesBySegment;
-            }, 'observeOwnerVariesBySegment');
+            }, 'observeOwnerVariesBySegment')?.asPromise();
+            if (varyByCulturePromise && varyBySegmentPromise && this.#initResolver) {
+                Promise.all([varyByCulturePromise, varyBySegmentPromise])
+                    .then(() => {
+                    this.#initResolver?.();
+                    this.#initResolver = undefined;
+                    this.#initReject = undefined;
+                })
+                    .catch(() => { });
+            }
         });
         this.observe(this.#propertyStructureHelper.propertyStructure, (propertyStructure) => {
             this._properties = propertyStructure;
             this.#sorter.setModel(this._properties);
         });
     }
-    createPropertyTypeWorkspaceRoutes() {
+    disconnectedCallback() {
+        super.disconnectedCallback();
+        this.#initReject?.(new Error('Component disconnected'));
+    }
+    async #createPropertyTypeWorkspaceRoutes() {
+        await this.#init;
         if (!this._ownerContentTypeUnique || this._containerId === undefined)
             return;
         // Note: Route for adding a new property
@@ -169,6 +190,12 @@ let UmbContentTypeDesignEditorPropertiesElement = class UmbContentTypeDesignEdit
                 }
                 preset.sortOrder = sortOrderInt;
             }
+            if (this._ownerContentTypeVariesByCulture) {
+                preset.variesByCulture = true;
+            }
+            if (this._ownerContentTypeVariesBySegment) {
+                preset.variesBySegment = true;
+            }
             return { data: { contentTypeUnique: this._ownerContentTypeUnique, preset: preset } };
         })
             .observeRouteBuilder((routeBuilder) => {

package/dist-cms/packages/content/property-type/workspace/views/settings/property-workspace-view-settings.element.js

@@ -43,8 +43,8 @@ let UmbPropertyTypeWorkspaceViewSettingsElement = class UmbPropertyTypeWorkspace
             this.observe(instance?.isNew, (isNew) => (this._isNew = isNew), '_observeIsNew');
         });
         this.consumeContext(UMB_CONTENT_TYPE_WORKSPACE_CONTEXT, (instance) => {
-            this.observe(instance?.variesByCulture, (variesByCulture) => (this._contentTypeVariesByCulture = variesByCulture));
-            this.observe(instance?.variesBySegment, (variesBySegment) => (this._contentTypeVariesBySegment = variesBySegment));
+            this.observe(instance?.variesByCulture, (variesByCulture) => (this._contentTypeVariesByCulture = variesByCulture), 'observeVariesByCulture');
+            this.observe(instance?.variesBySegment, (variesBySegment) => (this._contentTypeVariesBySegment = variesBySegment), 'observeVariesBySegment');
             this._entityType = instance?.getEntityType();
         }).passContextAliasMatches();
     }

package/dist-cms/packages/core/auth/auth-flow.js

@@ -198,6 +198,9 @@ export class UmbAuthFlow {
         await this.#storageBackend.removeItem(UMB_STORAGE_TOKEN_RESPONSE_NAME);
         // clear the internal state
         this.#tokenResponse.setValue(undefined);
+        // Also cleanup any OAuth/PKCE artifacts that may still be in localStorage
+        // This is a defense-in-depth measure during logout
+        await this.#authorizationHandler.cleanupStaleAuthorizationData();
     }
     /**
      * This method will sign the user out of the application.

package/dist-cms/packages/core/tree/tree-item/tree-item-children.manager.js

@@ -183,6 +183,11 @@ export class UmbTreeItemChildrenManager extends UmbControllerBase {
      * @memberof UmbTreeItemChildrenManager
      */
     async loadChildren() {
+        const target = this.targetPagination.getBaseTarget();
+        /* If a new target is set we only want to reload children if the new target isn’t among the already loaded items. */
+        if (target && this.isChildLoaded(target)) {
+            return;
+        }
         return this.#loadChildren();
     }
     /**
@@ -230,7 +235,7 @@ export class UmbTreeItemChildrenManager extends UmbControllerBase {
                     ? this.targetPagination.getNumberOfCurrentItemsBeforeBaseTarget()
                     : this.#takeBeforeTarget !== undefined
                         ? this.#takeBeforeTarget
-                        : 5,
+                        : this.targetPagination.getTakeSize(),
                 takeAfter: reload
                     ? this.targetPagination.getNumberOfCurrentItemsAfterBaseTarget()
                     : this.#takeAfterTarget !== undefined

package/dist-cms/packages/core/tree/tree-item/tree-item-expansion.manager.js

@@ -63,11 +63,6 @@ export class UmbTreeItemTargetExpansionManager extends UmbControllerBase {
             if (currentBaseTarget && !target) {
                 return;
             }
-            /* If a new target is set we only want to reload children if the new target isn’t among the already loaded items. */
-            const targetIsLoaded = this.#childrenManager.isChildLoaded(target);
-            if (target && targetIsLoaded) {
-                return;
-            }
             // If we already have children and the target didn't change then we don't have to load new children
             const isNewTarget = target !== currentBaseTarget;
             if (isExpanded && this.#childrenManager.hasLoadedChildren() && !isNewTarget) {

package/dist-cms/packages/data-type/modals/data-type-picker-flow/data-type-picker-flow-modal.element.js

@@ -108,7 +108,8 @@ let UmbDataTypePickerFlowModalElement = class UmbDataTypePickerFlowModalElement
             }
             this.removeUmbController(contentContextConsumer);
             this.removeUmbController(propContextConsumer);
-            const propertyEditorName = this.#propertyEditorUIs.find((ui) => ui.alias === params.uiAlias)?.name;
+            const propertyEditorUiManifest = this.#propertyEditorUIs.find((ui) => ui.alias === params.uiAlias);
+            const propertyEditorName = this.localize.string(propertyEditorUiManifest?.meta?.label || propertyEditorUiManifest?.name || '#general_notFound');
             const dataTypeName = `${contentContext?.getName() ?? ''} - ${propContext.getName() ?? ''} - ${propertyEditorName}`;
             return {
                 data: {

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

@@ -149,7 +149,7 @@ export class UmbDataTypeWorkspaceContext extends UmbEntityNamedDetailWorkspaceCo
         }
         this.observe(umbExtensionsRegistry.byTypeAndAlias('propertyEditorUi', propertyEditorUIAlias), (manifest) => {
             this.#propertyEditorUiIcon.setValue(manifest?.meta.icon || null);
-            this.#propertyEditorUiName.setValue(manifest?.name || null);
+            this.#propertyEditorUiName.setValue(manifest?.meta?.label || manifest?.name || null);
             // Maps properties to have a weight, so they can be sorted, notice UI properties have a +1000 weight compared to schema properties.
             this.#propertyEditorUISettingsProperties = (manifest?.meta.settings?.properties ?? []).map((x, i) => ({
                 ...x,

package/dist-cms/packages/data-type/workspace/views/details/data-type-details-workspace-property-editor-picker.element.js

@@ -50,7 +50,7 @@ let UmbDataTypeDetailsWorkspacePropertyEditorPickerElement = class UmbDataTypeDe
     #renderPropertyEditorReference() {
         if (!this.propertyEditorUiAlias || !this.propertyEditorSchemaAlias)
             return nothing;
-        let name = this.propertyEditorUiName;
+        let name = this.localize.string(this.propertyEditorUiName);
         let alias = this.propertyEditorUiAlias;
         let error = false;
         if (!this.propertyEditorUiName) {

package/dist-cms/packages/documents/documents/tree/tree-item/document-tree-item.context.js

@@ -14,7 +14,7 @@ export class UmbDocumentTreeItemContext extends UmbDefaultTreeItemContext {
         if (isMenu) {
             this.observe(this.hasCollection, (hasCollection) => {
                 if (hasCollection) {
-                    this._treeItemChildrenManager.setTargetTakeSize(2, 2);
+                    this._treeItemChildrenManager.setTargetTakeSize(1, 1);
                     this.observe(this.hasActiveDescendant, (active) => {
                         if (active === false) {
                             super.hideChildren();