@umbraco-cms/backoffice 14.0.0--preview004-b8e22352 → 14.0.0--preview004-9e9461f6

package/dist-cms/apps/app/app.element.js

@@ -101,7 +101,7 @@ _UmbAppElement_setup = async function _UmbAppElement_setup() {
         // If the runtime level is "install" we should clear any cached tokens
         // else we should try and set the auth status
         if (__classPrivateFieldGet(this, _UmbAppElement_serverConnection, "f").getStatus() === RuntimeLevelModel.INSTALL) {
-            await __classPrivateFieldGet(this, _UmbAppElement_authContext, "f").signOut();
+            await __classPrivateFieldGet(this, _UmbAppElement_authContext, "f").clearTokenStorage();
         }
         else {
             await __classPrivateFieldGet(this, _UmbAppElement_instances, "m", _UmbAppElement_setAuthStatus).call(this);

package/dist-cms/custom-elements.json

@@ -6194,21 +6194,7 @@
     {
       "name": "umb-document-type-create-options-modal",
       "path": "./../src/packages/documents/document-types/entity-actions/create/modal/document-type-create-options-modal.element.ts",
-      "attributes": [
-        {
-          "name": "data",
-          "type": "UmbDocumentTypeCreateOptionsModalData | undefined"
-        }
-      ],
       "properties": [
-        {
-          "name": "modalContext"
-        },
-        {
-          "name": "data",
-          "attribute": "data",
-          "type": "UmbDocumentTypeCreateOptionsModalData | undefined"
-        },
         {
           "name": "styles",
           "type": "array",

package/dist-cms/packages/core/data-type/tree/folder/data-type-folder.repository.js

@@ -8,7 +8,7 @@ export class UmbDataTypeFolderRepository extends UmbFolderRepositoryBase {
     }
 }
 const folderToDataTypeTreeItemMapper = (folder) => {
-    const folderTreeItem = {
+    return {
         unique: folder.unique,
         parentUnique: folder.parentUnique,
         name: folder.name,
@@ -17,5 +17,4 @@ const folderToDataTypeTreeItemMapper = (folder) => {
         hasChildren: false,
         isFolder: true,
     };
-    return folderTreeItem;
 };

package/dist-cms/packages/documents/document-types/entity-actions/create/create.action.js

@@ -28,7 +28,7 @@ export class UmbCreateDataTypeEntityAction extends UmbEntityActionBase {
             throw new Error('Repository is not available');
         __classPrivateFieldGet(this, _UmbCreateDataTypeEntityAction_modalManagerContext, "f")?.open(UMB_DOCUMENT_TYPE_CREATE_OPTIONS_MODAL, {
             data: {
-                parentKey: this.unique,
+                parentUnique: this.unique,
             },
         });
     }

package/dist-cms/packages/documents/document-types/entity-actions/create/modal/document-type-create-options-modal.element.d.ts

@@ -1,11 +1,8 @@
 import { UmbDocumentTypeCreateOptionsModalData } from './index.js';
-import { type UmbModalContext } from '../../../../../core/modal/index.js';
-import { UmbLitElement } from '../../../../../../shared/lit-element/index.js';
-export declare class UmbDataTypeCreateOptionsModalElement extends UmbLitElement {
+import { UmbModalBaseElement } from '../../../../../core/modal/index.js';
+export declare class UmbDataTypeCreateOptionsModalElement extends UmbModalBaseElement<UmbDocumentTypeCreateOptionsModalData> {
     #private;
-    modalContext?: UmbModalContext<UmbDocumentTypeCreateOptionsModalData>;
-    data?: UmbDocumentTypeCreateOptionsModalData;
-    constructor();
+    connectedCallback(): void;
     render(): import("lit-html").TemplateResult<1>;
     static styles: import("../../../../../../external/lit/index.js").CSSResult[];
 }

package/dist-cms/packages/documents/document-types/entity-actions/create/modal/document-type-create-options-modal.element.js

@@ -15,21 +15,27 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _UmbDataTypeCreateOptionsModalElement_instances, _UmbDataTypeCreateOptionsModalElement_modalContext, _UmbDataTypeCreateOptionsModalElement_onClick, _UmbDataTypeCreateOptionsModalElement_onNavigate, _UmbDataTypeCreateOptionsModalElement_onCancel;
-import { DOCUMENT_TYPE_DETAIL_REPOSITORY_ALIAS } from '../../../repository/index.js';
-import { html, customElement, property } from '../../../../../../external/lit/index.js';
+var _UmbDataTypeCreateOptionsModalElement_instances, _UmbDataTypeCreateOptionsModalElement_createFolderAction, _UmbDataTypeCreateOptionsModalElement_onCreateFolderClick, _UmbDataTypeCreateOptionsModalElement_onNavigate;
+import { UMB_DOCUMENT_TYPE_FOLDER_REPOSITORY_ALIAS } from '../../../tree/index.js';
+import { html, customElement } from '../../../../../../external/lit/index.js';
 import { UmbTextStyles } from '../../../../../../shared/style/index.js';
-import { UMB_MODAL_MANAGER_CONTEXT_TOKEN, } from '../../../../../core/modal/index.js';
-import { UMB_FOLDER_CREATE_MODAL } from '../../../../../core/tree/index.js';
-import { UmbLitElement } from '../../../../../../shared/lit-element/index.js';
-let UmbDataTypeCreateOptionsModalElement = class UmbDataTypeCreateOptionsModalElement extends UmbLitElement {
+import { UmbModalBaseElement } from '../../../../../core/modal/index.js';
+import { UmbCreateFolderEntityAction } from '../../../../../core/tree/index.js';
+let UmbDataTypeCreateOptionsModalElement = class UmbDataTypeCreateOptionsModalElement extends UmbModalBaseElement {
     constructor() {
-        super();
+        super(...arguments);
         _UmbDataTypeCreateOptionsModalElement_instances.add(this);
-        _UmbDataTypeCreateOptionsModalElement_modalContext.set(this, void 0);
-        this.consumeContext(UMB_MODAL_MANAGER_CONTEXT_TOKEN, (instance) => {
-            __classPrivateFieldSet(this, _UmbDataTypeCreateOptionsModalElement_modalContext, instance, "f");
-        });
+        _UmbDataTypeCreateOptionsModalElement_createFolderAction.set(this, void 0);
+    }
+    connectedCallback() {
+        super.connectedCallback();
+        if (this.data?.parentUnique === undefined)
+            throw new Error('A parent unique is required to create a folder');
+        __classPrivateFieldSet(this, _UmbDataTypeCreateOptionsModalElement_createFolderAction, new UmbCreateFolderEntityAction(this, UMB_DOCUMENT_TYPE_FOLDER_REPOSITORY_ALIAS, 
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore
+        // TODO: allow null for entity actions. Some actions can be executed on the root item
+        this.data.parentUnique), "f");
     }
     render() {
         return html `
@@ -37,47 +43,36 @@ let UmbDataTypeCreateOptionsModalElement = class UmbDataTypeCreateOptionsModalEl
 				<uui-box>
 					<!-- TODO: construct url -->
 					<uui-menu-item
-						href=${`section/settings/workspace/document-type/create/${this.data?.parentKey || 'null'}`}
+						href=${`section/settings/workspace/document-type/create/${this.data?.parentUnique || 'null'}`}
 						label="New Document Type..."
 						@click=${__classPrivateFieldGet(this, _UmbDataTypeCreateOptionsModalElement_instances, "m", _UmbDataTypeCreateOptionsModalElement_onNavigate)}>
 						<uui-icon slot="icon" name="icon-autofill"></uui-icon>}
 					</uui-menu-item>
-					<uui-menu-item @click=${__classPrivateFieldGet(this, _UmbDataTypeCreateOptionsModalElement_instances, "m", _UmbDataTypeCreateOptionsModalElement_onClick)} label="New Folder...">
+					<uui-menu-item @click=${__classPrivateFieldGet(this, _UmbDataTypeCreateOptionsModalElement_instances, "m", _UmbDataTypeCreateOptionsModalElement_onCreateFolderClick)} label="New Folder...">
 						<uui-icon slot="icon" name="icon-folder"></uui-icon>}
 					</uui-menu-item>
 				</uui-box>
-				<uui-button slot="actions" id="cancel" label="Cancel" @click="${__classPrivateFieldGet(this, _UmbDataTypeCreateOptionsModalElement_instances, "m", _UmbDataTypeCreateOptionsModalElement_onCancel)}">Cancel</uui-button>
+				<uui-button slot="actions" id="cancel" label="Cancel" @click="${this._rejectModal}">Cancel</uui-button>
 			</umb-body-layout>
 		`;
     }
 };
-_UmbDataTypeCreateOptionsModalElement_modalContext = new WeakMap();
+_UmbDataTypeCreateOptionsModalElement_createFolderAction = new WeakMap();
 _UmbDataTypeCreateOptionsModalElement_instances = new WeakSet();
-_UmbDataTypeCreateOptionsModalElement_onClick = function _UmbDataTypeCreateOptionsModalElement_onClick(event) {
+_UmbDataTypeCreateOptionsModalElement_onCreateFolderClick = async function _UmbDataTypeCreateOptionsModalElement_onCreateFolderClick(event) {
     event.stopPropagation();
-    if (this.data?.parentKey === undefined)
-        throw new Error('A parent unique is required to create a folder');
-    const folderModalHandler = __classPrivateFieldGet(this, _UmbDataTypeCreateOptionsModalElement_modalContext, "f")?.open(UMB_FOLDER_CREATE_MODAL, {
-        data: {
-            folderRepositoryAlias: DOCUMENT_TYPE_DETAIL_REPOSITORY_ALIAS,
-            parentUnique: this.data?.parentKey,
-        },
-    });
-    folderModalHandler?.onSubmit().then(() => this.modalContext?.submit());
+    try {
+        await __classPrivateFieldGet(this, _UmbDataTypeCreateOptionsModalElement_createFolderAction, "f")?.execute();
+        this._submitModal();
+    }
+    catch (error) {
+        console.error(error);
+    }
 };
 _UmbDataTypeCreateOptionsModalElement_onNavigate = function _UmbDataTypeCreateOptionsModalElement_onNavigate() {
-    this.modalContext?.submit();
-};
-_UmbDataTypeCreateOptionsModalElement_onCancel = function _UmbDataTypeCreateOptionsModalElement_onCancel() {
-    this.modalContext?.reject();
+    this._rejectModal();
 };
 UmbDataTypeCreateOptionsModalElement.styles = [UmbTextStyles];
-__decorate([
-    property({ attribute: false })
-], UmbDataTypeCreateOptionsModalElement.prototype, "modalContext", void 0);
-__decorate([
-    property({ type: Object })
-], UmbDataTypeCreateOptionsModalElement.prototype, "data", void 0);
 UmbDataTypeCreateOptionsModalElement = __decorate([
     customElement('umb-document-type-create-options-modal')
 ], UmbDataTypeCreateOptionsModalElement);

package/dist-cms/packages/documents/document-types/entity-actions/create/modal/index.d.ts

@@ -1,5 +1,5 @@
 import { UmbModalToken } from '../../../../../core/modal/index.js';
 export interface UmbDocumentTypeCreateOptionsModalData {
-    parentKey: string | null;
+    parentUnique: string | null;
 }
 export declare const UMB_DOCUMENT_TYPE_CREATE_OPTIONS_MODAL: UmbModalToken<UmbDocumentTypeCreateOptionsModalData, unknown>;

package/dist-cms/packages/documents/document-types/tree/folder/document-type-folder.repository.d.ts

@@ -0,0 +1,6 @@
+import { UmbDocumentTypeFolderTreeItemModel } from './types.js';
+import { type UmbControllerHost } from '../../../../../libs/controller-api/index.js';
+import { UmbFolderRepositoryBase } from '../../../../core/tree/index.js';
+export declare class UmbDocumentTypeFolderRepository extends UmbFolderRepositoryBase<UmbDocumentTypeFolderTreeItemModel> {
+    constructor(host: UmbControllerHost);
+}

package/dist-cms/packages/documents/document-types/tree/folder/document-type-folder.repository.js

@@ -0,0 +1,21 @@
+import { UMB_DOCUMENT_TYPE_FOLDER_ENTITY_TYPE } from '../../entity.js';
+import { UMB_DOCUMENT_TYPE_TREE_STORE_CONTEXT } from '../../tree/index.js';
+import { UmbDocumentTypeFolderServerDataSource } from './document-type-folder.server.data-source.js';
+import { UmbFolderRepositoryBase } from '../../../../core/tree/index.js';
+export class UmbDocumentTypeFolderRepository extends UmbFolderRepositoryBase {
+    constructor(host) {
+        super(host, UmbDocumentTypeFolderServerDataSource, UMB_DOCUMENT_TYPE_TREE_STORE_CONTEXT, folderToDocumentTypeTreeItemMapper);
+    }
+}
+const folderToDocumentTypeTreeItemMapper = (folder) => {
+    return {
+        unique: folder.unique,
+        parentUnique: folder.parentUnique,
+        name: folder.name,
+        entityType: UMB_DOCUMENT_TYPE_FOLDER_ENTITY_TYPE,
+        isContainer: false,
+        hasChildren: false,
+        isFolder: true,
+        isElement: false,
+    };
+};

package/dist-cms/packages/documents/document-types/tree/folder/document-type-folder.server.data-source.d.ts

@@ -0,0 +1,75 @@
+import { UmbCreateFolderModel, UmbFolderDataSource, UmbUpdateFolderModel } from '../../../../core/tree/index.js';
+import type { UmbControllerHost } from '../../../../../libs/controller-api/index.js';
+/**
+ * A data source for a Document Type folder that fetches data from the server
+ * @export
+ * @class UmbDocumentTypeFolderServerDataSource
+ * @implements {RepositoryDetailDataSource}
+ */
+export declare class UmbDocumentTypeFolderServerDataSource implements UmbFolderDataSource {
+    #private;
+    /**
+     * Creates an instance of UmbDocumentTypeFolderServerDataSource.
+     * @param {UmbControllerHost} host
+     * @memberof UmbDocumentTypeFolderServerDataSource
+     */
+    constructor(host: UmbControllerHost);
+    /**
+     * Fetches a Document Type folder from the server
+     * @param {string} unique
+     * @return {*}
+     * @memberof UmbDocumentTypeFolderServerDataSource
+     */
+    read(unique: string): Promise<{
+        data: {
+            unique: string;
+            name: string;
+            parentUnique: string | null;
+        };
+        error?: undefined;
+    } | {
+        error: import("../../../../../external/backend-api/index.js").ApiError | import("../../../../../external/backend-api/index.js").CancelError | undefined;
+        data?: undefined;
+    }>;
+    /**
+     * Creates a Document Type folder on the server
+     * @param {UmbCreateFolderModel} args
+     * @return {*}
+     * @memberof UmbDocumentTypeFolderServerDataSource
+     */
+    create(args: UmbCreateFolderModel): Promise<{
+        data: {
+            unique: string;
+            name: string;
+            parentUnique: string | null;
+        };
+        error?: undefined;
+    } | {
+        error: import("../../../../../external/backend-api/index.js").ApiError | import("../../../../../external/backend-api/index.js").CancelError | undefined;
+        data?: undefined;
+    }>;
+    /**
+     * Updates a Document Type folder on the server
+     * @param {UmbUpdateFolderModel} args
+     * @return {*}
+     * @memberof UmbDocumentTypeFolderServerDataSource
+     */
+    update(args: UmbUpdateFolderModel): Promise<{
+        data: {
+            unique: string;
+            name: string;
+            parentUnique: string | null;
+        };
+        error?: undefined;
+    } | {
+        error: import("../../../../../external/backend-api/index.js").ApiError | import("../../../../../external/backend-api/index.js").CancelError | undefined;
+        data?: undefined;
+    }>;
+    /**
+     * Deletes a Document Type folder on the server
+     * @param {string} unique
+     * @return {*}
+     * @memberof UmbDocumentTypeServerDataSource
+     */
+    delete(unique: string): Promise<import("../../../../core/repository/index.js").DataSourceResponse<any>>;
+}

package/dist-cms/packages/documents/document-types/tree/folder/document-type-folder.server.data-source.js

@@ -0,0 +1,111 @@
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _UmbDocumentTypeFolderServerDataSource_host;
+import { DocumentTypeResource } from '../../../../../external/backend-api/index.js';
+import { tryExecuteAndNotify } from '../../../../../shared/resources/index.js';
+/**
+ * A data source for a Document Type folder that fetches data from the server
+ * @export
+ * @class UmbDocumentTypeFolderServerDataSource
+ * @implements {RepositoryDetailDataSource}
+ */
+export class UmbDocumentTypeFolderServerDataSource {
+    /**
+     * Creates an instance of UmbDocumentTypeFolderServerDataSource.
+     * @param {UmbControllerHost} host
+     * @memberof UmbDocumentTypeFolderServerDataSource
+     */
+    constructor(host) {
+        _UmbDocumentTypeFolderServerDataSource_host.set(this, void 0);
+        __classPrivateFieldSet(this, _UmbDocumentTypeFolderServerDataSource_host, host, "f");
+    }
+    /**
+     * Fetches a Document Type folder from the server
+     * @param {string} unique
+     * @return {*}
+     * @memberof UmbDocumentTypeFolderServerDataSource
+     */
+    async read(unique) {
+        if (!unique)
+            throw new Error('Unique is missing');
+        const { data, error } = await tryExecuteAndNotify(__classPrivateFieldGet(this, _UmbDocumentTypeFolderServerDataSource_host, "f"), DocumentTypeResource.getDocumentTypeFolderById({
+            id: unique,
+        }));
+        if (data) {
+            const mappedData = {
+                unique: data.id,
+                name: data.name,
+                parentUnique: data.parentId || null,
+            };
+            return { data: mappedData };
+        }
+        return { error };
+    }
+    /**
+     * Creates a Document Type folder on the server
+     * @param {UmbCreateFolderModel} args
+     * @return {*}
+     * @memberof UmbDocumentTypeFolderServerDataSource
+     */
+    async create(args) {
+        if (args.parentUnique === undefined)
+            throw new Error('Parent unique is missing');
+        if (!args.name)
+            throw new Error('Name is missing');
+        const requestBody = {
+            id: args.unique,
+            parentId: args.parentUnique,
+            name: args.name,
+        };
+        const { error } = await tryExecuteAndNotify(__classPrivateFieldGet(this, _UmbDocumentTypeFolderServerDataSource_host, "f"), DocumentTypeResource.postDocumentTypeFolder({
+            requestBody,
+        }));
+        if (!error) {
+            return this.read(args.unique);
+        }
+        return { error };
+    }
+    /**
+     * Updates a Document Type folder on the server
+     * @param {UmbUpdateFolderModel} args
+     * @return {*}
+     * @memberof UmbDocumentTypeFolderServerDataSource
+     */
+    async update(args) {
+        if (!args.unique)
+            throw new Error('Unique is missing');
+        if (!args.name)
+            throw new Error('Folder name is missing');
+        const { error } = await tryExecuteAndNotify(__classPrivateFieldGet(this, _UmbDocumentTypeFolderServerDataSource_host, "f"), DocumentTypeResource.putDocumentTypeFolderById({
+            id: args.unique,
+            requestBody: { name: args.name },
+        }));
+        if (!error) {
+            return this.read(args.unique);
+        }
+        return { error };
+    }
+    /**
+     * Deletes a Document Type folder on the server
+     * @param {string} unique
+     * @return {*}
+     * @memberof UmbDocumentTypeServerDataSource
+     */
+    async delete(unique) {
+        if (!unique)
+            throw new Error('Unique is missing');
+        return tryExecuteAndNotify(__classPrivateFieldGet(this, _UmbDocumentTypeFolderServerDataSource_host, "f"), DocumentTypeResource.deleteDocumentTypeFolderById({
+            id: unique,
+        }));
+    }
+}
+_UmbDocumentTypeFolderServerDataSource_host = new WeakMap();

package/dist-cms/packages/documents/document-types/tree/folder/index.d.ts

@@ -0,0 +1,2 @@
+export { UmbDocumentTypeFolderRepository } from './document-type-folder.repository.js';
+export { UMB_DOCUMENT_TYPE_FOLDER_REPOSITORY_ALIAS } from './manifests.js';

package/dist-cms/packages/documents/document-types/tree/folder/index.js

@@ -0,0 +1,2 @@
+export { UmbDocumentTypeFolderRepository } from './document-type-folder.repository.js';
+export { UMB_DOCUMENT_TYPE_FOLDER_REPOSITORY_ALIAS } from './manifests.js';

package/dist-cms/packages/documents/document-types/tree/folder/manifests.d.ts

@@ -0,0 +1,3 @@
+import type { ManifestEntityAction, ManifestRepository } from '../../../../core/extension-registry/index.js';
+export declare const UMB_DOCUMENT_TYPE_FOLDER_REPOSITORY_ALIAS = "Umb.Repository.DocumentType.Folder";
+export declare const manifests: (ManifestEntityAction | ManifestRepository<import("../../../../../libs/extension-api/index.js").UmbApi>)[];

package/dist-cms/packages/documents/document-types/tree/folder/manifests.js

@@ -0,0 +1,39 @@
+import { UMB_DOCUMENT_TYPE_FOLDER_ENTITY_TYPE } from '../../entity.js';
+import { UmbDocumentTypeFolderRepository } from './document-type-folder.repository.js';
+import { UmbDeleteFolderEntityAction, UmbFolderUpdateEntityAction } from '../../../../core/tree/index.js';
+export const UMB_DOCUMENT_TYPE_FOLDER_REPOSITORY_ALIAS = 'Umb.Repository.DocumentType.Folder';
+const folderRepository = {
+    type: 'repository',
+    alias: UMB_DOCUMENT_TYPE_FOLDER_REPOSITORY_ALIAS,
+    name: 'Document Type Folder Repository',
+    api: UmbDocumentTypeFolderRepository,
+};
+const entityActions = [
+    {
+        type: 'entityAction',
+        alias: 'Umb.EntityAction.DocumentType.DeleteFolder',
+        name: 'Delete Document Type Folder Entity Action',
+        weight: 800,
+        api: UmbDeleteFolderEntityAction,
+        meta: {
+            icon: 'icon-trash',
+            label: 'Delete Folder...',
+            repositoryAlias: UMB_DOCUMENT_TYPE_FOLDER_REPOSITORY_ALIAS,
+            entityTypes: [UMB_DOCUMENT_TYPE_FOLDER_ENTITY_TYPE],
+        },
+    },
+    {
+        type: 'entityAction',
+        alias: 'Umb.EntityAction.DocumentType.RenameFolder',
+        name: 'Rename Document Type Folder Entity Action',
+        weight: 700,
+        api: UmbFolderUpdateEntityAction,
+        meta: {
+            icon: 'icon-edit',
+            label: 'Rename Folder...',
+            repositoryAlias: UMB_DOCUMENT_TYPE_FOLDER_REPOSITORY_ALIAS,
+            entityTypes: [UMB_DOCUMENT_TYPE_FOLDER_ENTITY_TYPE],
+        },
+    },
+];
+export const manifests = [folderRepository, ...entityActions];

package/dist-cms/packages/documents/document-types/tree/folder/types.d.ts

@@ -0,0 +1,5 @@
+import { UMB_DOCUMENT_TYPE_FOLDER_ENTITY_TYPE } from '../../entity.js';
+import { UmbDocumentTypeTreeItemModel } from '../types.js';
+export interface UmbDocumentTypeFolderTreeItemModel extends UmbDocumentTypeTreeItemModel {
+    entityType: typeof UMB_DOCUMENT_TYPE_FOLDER_ENTITY_TYPE;
+}

package/dist-cms/packages/documents/document-types/tree/folder/types.js

@@ -0,0 +1 @@
+export {};

package/dist-cms/packages/documents/document-types/tree/index.d.ts

@@ -0,0 +1,2 @@
+export { UMB_DOCUMENT_TYPE_TREE_STORE_CONTEXT } from './document-type.tree.store.js';
+export * from './folder/index.js';

package/dist-cms/packages/documents/document-types/tree/index.js

@@ -0,0 +1,2 @@
+export { UMB_DOCUMENT_TYPE_TREE_STORE_CONTEXT } from './document-type.tree.store.js';
+export * from './folder/index.js';

package/dist-cms/packages/documents/document-types/tree/manifests.d.ts

@@ -2,4 +2,4 @@ import type { ManifestRepository, ManifestTree, ManifestTreeItem, ManifestTreeSt
 export declare const UMB_DOCUMENT_TYPE_TREE_REPOSITORY_ALIAS = "Umb.Repository.DocumentType.Tree";
 export declare const UMB_DOCUMENT_TYPE_TREE_STORE_ALIAS = "Umb.Store.DocumentType.Tree";
 export declare const UMB_DOCUMENT_TYPE_TREE_ALIAS = "Umb.Tree.DocumentType";
-export declare const manifests: (ManifestTree | ManifestTreeItem | ManifestTreeStore | ManifestRepository<import("../../../../libs/extension-api/index.js").UmbApi>)[];
+export declare const manifests: (import("../../../core/extension-registry/index.js").ManifestEntityAction | ManifestTree | ManifestTreeItem | ManifestTreeStore | ManifestRepository<import("../../../../libs/extension-api/index.js").UmbApi>)[];

package/dist-cms/packages/documents/document-types/tree/manifests.js

@@ -1,6 +1,7 @@
-import { UMB_DOCUMENT_TYPE_ENTITY_TYPE, UMB_DOCUMENT_TYPE_ROOT_ENTITY_TYPE } from '../entity.js';
+import { UMB_DOCUMENT_TYPE_ENTITY_TYPE, UMB_DOCUMENT_TYPE_FOLDER_ENTITY_TYPE, UMB_DOCUMENT_TYPE_ROOT_ENTITY_TYPE, } from '../entity.js';
 import { UmbDocumentTypeTreeRepository } from './document-type-tree.repository.js';
 import { UmbDocumentTypeTreeStore } from './document-type.tree.store.js';
+import { manifests as folderManifests } from './folder/manifests.js';
 export const UMB_DOCUMENT_TYPE_TREE_REPOSITORY_ALIAS = 'Umb.Repository.DocumentType.Tree';
 export const UMB_DOCUMENT_TYPE_TREE_STORE_ALIAS = 'Umb.Store.DocumentType.Tree';
 export const UMB_DOCUMENT_TYPE_TREE_ALIAS = 'Umb.Tree.DocumentType';
@@ -30,7 +31,11 @@ const treeItem = {
     alias: 'Umb.TreeItem.DocumentType',
     name: 'Document Type Tree Item',
     meta: {
-        entityTypes: [UMB_DOCUMENT_TYPE_ROOT_ENTITY_TYPE, UMB_DOCUMENT_TYPE_ENTITY_TYPE],
+        entityTypes: [
+            UMB_DOCUMENT_TYPE_ROOT_ENTITY_TYPE,
+            UMB_DOCUMENT_TYPE_ENTITY_TYPE,
+            UMB_DOCUMENT_TYPE_FOLDER_ENTITY_TYPE,
+        ],
     },
 };
-export const manifests = [treeRepository, treeStore, tree, treeItem];
+export const manifests = [treeRepository, treeStore, tree, treeItem, ...folderManifests];

package/dist-cms/packages/user/current-user/modals/current-user/current-user-modal.element.js

@@ -52,10 +52,7 @@ let UmbCurrentUserModalElement = class UmbCurrentUserModalElement extends UmbLit
     async _logout() {
         if (!__classPrivateFieldGet(this, _UmbCurrentUserModalElement_authContext, "f"))
             return;
-        await __classPrivateFieldGet(this, _UmbCurrentUserModalElement_authContext, "f").signOut();
-        let newUrl = __classPrivateFieldGet(this, _UmbCurrentUserModalElement_appContext, "f") ? `${__classPrivateFieldGet(this, _UmbCurrentUserModalElement_appContext, "f").getBackofficePath()}/login` : '/';
-        newUrl = newUrl.replace(/\/\//g, '/');
-        location.href = newUrl;
+        __classPrivateFieldGet(this, _UmbCurrentUserModalElement_authContext, "f").signOut();
     }
     render() {
         return html `

package/dist-cms/shared/auth/auth-flow.d.ts

@@ -72,6 +72,10 @@ export declare class UmbAuthFlow {
      * @returns true if the user is logged in, false otherwise.
      */
     isAuthorized(): boolean;
+    /**
+     * Forget all cached token state
+     */
+    clearTokenStorage(): Promise<void>;
     /**
      * This method will sign the user out of the application.
      */

package/dist-cms/shared/auth/auth-flow.js

@@ -25,7 +25,7 @@ var _UmbAuthFlow_instances, _UmbAuthFlow_notifier, _UmbAuthFlow_authorizationHan
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-import { BaseTokenRequestHandler, BasicQueryStringUtils, FetchRequestor, LocalStorageBackend, RedirectRequestHandler, AuthorizationRequest, AuthorizationNotifier, AuthorizationServiceConfiguration, GRANT_TYPE_AUTHORIZATION_CODE, GRANT_TYPE_REFRESH_TOKEN, TokenRequest, TokenResponse, } from '../../external/openid/index.js';
+import { BaseTokenRequestHandler, BasicQueryStringUtils, FetchRequestor, LocalStorageBackend, RedirectRequestHandler, AuthorizationRequest, AuthorizationNotifier, AuthorizationServiceConfiguration, GRANT_TYPE_AUTHORIZATION_CODE, GRANT_TYPE_REFRESH_TOKEN, RevokeTokenRequest, TokenRequest, TokenResponse, } from '../../external/openid/index.js';
 const requestor = new FetchRequestor();
 const TOKEN_RESPONSE_NAME = 'umb:userAuthTokenResponse';
 /**
@@ -185,32 +185,48 @@ export class UmbAuthFlow {
     isAuthorized() {
         return !!__classPrivateFieldGet(this, _UmbAuthFlow_accessTokenResponse, "f") && __classPrivateFieldGet(this, _UmbAuthFlow_accessTokenResponse, "f").isValid();
     }
+    /**
+     * Forget all cached token state
+     */
+    async clearTokenStorage() {
+        await __classPrivateFieldGet(this, _UmbAuthFlow_storageBackend, "f").removeItem(TOKEN_RESPONSE_NAME);
+        // clear the internal state
+        __classPrivateFieldSet(this, _UmbAuthFlow_accessTokenResponse, undefined, "f");
+        __classPrivateFieldSet(this, _UmbAuthFlow_refreshToken, undefined, "f");
+    }
     /**
      * This method will sign the user out of the application.
      */
     async signOut() {
-        // forget all cached token state
-        await __classPrivateFieldGet(this, _UmbAuthFlow_storageBackend, "f").removeItem(TOKEN_RESPONSE_NAME);
+        const signOutPromises = [];
+        // revoke the access token if it exists
         if (__classPrivateFieldGet(this, _UmbAuthFlow_accessTokenResponse, "f")) {
-            // TODO: Enable this when the server supports it
-            // const tokenRevokeRequest = new RevokeTokenRequest({
-            // 	token: this.#accessTokenResponse.accessToken,
-            // 	client_id: this.#clientId,
-            // 	token_type_hint: 'access_token',
-            // });
-            // await this.#tokenHandler.performRevokeTokenRequest(this.#configuration, tokenRevokeRequest);
-            __classPrivateFieldSet(this, _UmbAuthFlow_accessTokenResponse, undefined, "f");
+            const tokenRevokeRequest = new RevokeTokenRequest({
+                token: __classPrivateFieldGet(this, _UmbAuthFlow_accessTokenResponse, "f").accessToken,
+                client_id: __classPrivateFieldGet(this, _UmbAuthFlow_clientId, "f"),
+                token_type_hint: 'access_token',
+            });
+            signOutPromises.push(__classPrivateFieldGet(this, _UmbAuthFlow_tokenHandler, "f").performRevokeTokenRequest(__classPrivateFieldGet(this, _UmbAuthFlow_configuration, "f"), tokenRevokeRequest));
         }
+        // revoke the refresh token if it exists
         if (__classPrivateFieldGet(this, _UmbAuthFlow_refreshToken, "f")) {
-            // TODO: Enable this when the server supports it
-            // const tokenRevokeRequest = new RevokeTokenRequest({
-            // 	token: this.#refreshToken,
-            // 	client_id: this.#clientId,
-            // 	token_type_hint: 'refresh_token',
-            // });
-            // await this.#tokenHandler.performRevokeTokenRequest(this.#configuration, tokenRevokeRequest);
-            __classPrivateFieldSet(this, _UmbAuthFlow_refreshToken, undefined, "f");
+            const tokenRevokeRequest = new RevokeTokenRequest({
+                token: __classPrivateFieldGet(this, _UmbAuthFlow_refreshToken, "f"),
+                client_id: __classPrivateFieldGet(this, _UmbAuthFlow_clientId, "f"),
+                token_type_hint: 'refresh_token',
+            });
+            signOutPromises.push(__classPrivateFieldGet(this, _UmbAuthFlow_tokenHandler, "f").performRevokeTokenRequest(__classPrivateFieldGet(this, _UmbAuthFlow_configuration, "f"), tokenRevokeRequest));
         }
+        // clear the internal token state
+        signOutPromises.push(this.clearTokenStorage());
+        // wait for all promises to settle before continuing
+        await Promise.allSettled(signOutPromises);
+        // clear the session on the server as well
+        // this will redirect the user to the end session endpoint of the server
+        // which will redirect the user back to the client
+        // and the client will then try and log in again (if the user is not logged in)
+        // which will redirect the user to the login page
+        location.href = `${__classPrivateFieldGet(this, _UmbAuthFlow_configuration, "f").endSessionEndpoint}?post_logout_redirect_uri=${__classPrivateFieldGet(this, _UmbAuthFlow_redirectUri, "f")}`;
     }
     /**
      * This method will check if the token needs to be refreshed and if so, it will refresh it and return the new access token.

package/dist-cms/shared/auth/auth.context.d.ts

@@ -28,6 +28,11 @@ export declare class UmbAuthContext extends UmbBaseController implements IUmbAut
      * @returns The latest token from the Management API
      */
     getLatestToken(): Promise<string>;
+    /**
+     * Clears the token storage.
+     * @memberof UmbAuthContext
+     */
+    clearTokenStorage(): Promise<void>;
     /**
      * Signs the user out by removing any tokens from the browser.
      * @return {*}  {Promise<void>}

package/dist-cms/shared/auth/auth.context.interface.d.ts

@@ -28,6 +28,10 @@ export interface IUmbAuthContext {
      * @returns The latest token from the Management API
      */
     getLatestToken(): Promise<string>;
+    /**
+     * Clears the token storage.
+     */
+    clearTokenStorage(): Promise<void>;
     /**
      * Signs the user out by removing any tokens from the browser.
      */