@umbraco-cms/backoffice 1.0.0-next.ea1e6e6f → 1.0.0-next.ed0b8881

package/dist-cms/packages/templating/templates/components/alias-input/alias-input.js

@@ -0,0 +1,82 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+import { UUITextStyles } from '@umbraco-ui/uui-css';
+import { css, customElement, html, property } from '../../../../../external/lit/index.js';
+import { UmbLitElement } from '../../../../../shared/lit-element/index.js';
+import { UmbChangeEvent } from '../../../../../shared/umb-events/index.js';
+let UmbTemplateAliasInputElement = class UmbTemplateAliasInputElement extends UmbLitElement {
+    constructor() {
+        super(...arguments);
+        this.value = '';
+        this.isOpen = false;
+    }
+    render() {
+        return html `
+        <uui-button compact @click=${this.#handleClick}>
+            <uui-symbol-lock .open=${this.isOpen} ></uui-symbol-lock>
+        </uui-button>
+        <input placeholder="Enter alias..." .value=${this.value} ?disabled=${!this.isOpen} @input=${this.#setValue}></input>
+        
+        `;
+    }
+    #setValue(event) {
+        event.stopPropagation();
+        this.value = event.target.value;
+    }
+    #handleClick() {
+        this.isOpen = !this.isOpen;
+        if (!this.isOpen) {
+            this.dispatchEvent(new UmbChangeEvent());
+        }
+    }
+    static { this.styles = [
+        UUITextStyles,
+        css `
+			:host {
+				display: inline-flex;
+				align-items: center;
+			}
+
+			:host(:focus-within) {
+				border-color: var(--uui-input-border-color-focus, var(--uui-color-border-emphasis, #a1a1a1));
+				outline: calc(2px * var(--uui-show-focus-outline, 1)) solid var(--uui-color-focus, #3879ff);
+			}
+
+			input {
+				background: transparent;
+				border-color: transparent;
+				font-family: inherit;
+				padding: var(--uui-size-1, 3px) var(--uui-size-space-3, 9px);
+				font-size: inherit;
+				color: inherit;
+				border-radius: 0px;
+				box-sizing: border-box;
+				border: none;
+				background: none;
+				width: 100%;
+				height: 100%;
+				text-align: inherit;
+				outline: none;
+			}
+
+			input:disabled {
+				color: #a2a1a6;
+			}
+		`,
+    ]; }
+};
+__decorate([
+    property({ type: String, attribute: 'value' })
+], UmbTemplateAliasInputElement.prototype, "value", void 0);
+__decorate([
+    property({ type: Boolean })
+], UmbTemplateAliasInputElement.prototype, "isOpen", void 0);
+UmbTemplateAliasInputElement = __decorate([
+    customElement('umb-template-alias-input')
+], UmbTemplateAliasInputElement);
+export { UmbTemplateAliasInputElement };
+export default UmbTemplateAliasInputElement;

package/dist-cms/packages/templating/templates/components/index.d.ts

@@ -1,2 +1,3 @@
 import './template-card/template-card.element.js';
 import './input-template/input-template.element.js';
+import './alias-input/alias-input.js';

package/dist-cms/packages/templating/templates/components/index.js

@@ -1,2 +1,3 @@
 import './template-card/template-card.element.js';
 import './input-template/input-template.element.js';
+import './alias-input/alias-input.js';

package/dist-cms/packages/templating/templates/entity-actions/manifests.js

@@ -1,4 +1,5 @@
 import { TEMPLATE_REPOSITORY_ALIAS } from '../repository/manifests.js';
+import { TEMPLATE_ENTITY_TYPE, TEMPLATE_ROOT_ENTITY_TYPE } from '../index.js';
 import { UmbCreateEntityAction } from './create/create.action.js';
 import { UmbDeleteEntityAction } from '../../../core/entity-action/index.js';
 const entityActions = [
@@ -13,7 +14,7 @@ const entityActions = [
             repositoryAlias: TEMPLATE_REPOSITORY_ALIAS,
         },
         conditions: {
-            entityTypes: ['template'],
+            entityTypes: [TEMPLATE_ENTITY_TYPE, TEMPLATE_ROOT_ENTITY_TYPE],
         },
     },
     {
@@ -27,7 +28,7 @@ const entityActions = [
             repositoryAlias: TEMPLATE_REPOSITORY_ALIAS,
         },
         conditions: {
-            entityTypes: ['template'],
+            entityTypes: [TEMPLATE_ENTITY_TYPE],
         },
     },
 ];

package/dist-cms/packages/templating/templates/index.d.ts

@@ -0,0 +1,4 @@
+export declare const TEMPLATE_ROOT_ENTITY_TYPE = "template-root";
+export declare const TEMPLATE_ENTITY_TYPE = "template";
+export declare const TEMPLATE_FOLDER_ENTITY_TYPE = "template-folder";
+import './components/index.js';

package/dist-cms/packages/templating/templates/index.js

@@ -0,0 +1,4 @@
+export const TEMPLATE_ROOT_ENTITY_TYPE = 'template-root';
+export const TEMPLATE_ENTITY_TYPE = 'template';
+export const TEMPLATE_FOLDER_ENTITY_TYPE = 'template-folder';
+import './components/index.js';

package/dist-cms/packages/templating/templates/repository/sources/template.detail.server.data.d.ts

@@ -7,7 +7,7 @@ import type { UmbDataSource } from '../../../../../shared/repository/index.js';
  * @class UmbTemplateDetailServerDataSource
  * @implements {TemplateDetailDataSource}
  */
-export declare class UmbTemplateDetailServerDataSource implements UmbDataSource<CreateTemplateRequestModel, any, UpdateTemplateRequestModel, TemplateResponseModel> {
+export declare class UmbTemplateDetailServerDataSource implements UmbDataSource<CreateTemplateRequestModel, string, UpdateTemplateRequestModel, TemplateResponseModel> {
     #private;
     /**
      * Creates an instance of UmbTemplateDetailServerDataSource.
@@ -22,23 +22,27 @@ export declare class UmbTemplateDetailServerDataSource implements UmbDataSource<
      * @memberof UmbTemplateDetailServerDataSource
      */
     get(id: string): Promise<import("../../../../../shared/repository/index.js").DataSourceResponse<TemplateResponseModel>>;
+    /**
+     * Gets template item - you can get name and id from that
+     * @param {string} id
+     * @return {*}
+     * @memberof UmbTemplateDetailServerDataSource
+     */
+    getItem(id: string[]): Promise<import("../../../../../shared/repository/index.js").DataSourceResponse<import("../../../../../external/backend-api/index.js").ItemResponseModelBaseModel[]>>;
     /**
      * Creates a new Template scaffold
      * @param {(string | null)} parentId
      * @return {*}
      * @memberof UmbTemplateDetailServerDataSource
      */
-    createScaffold(): Promise<{
-        data: TemplateResponseModel;
-        error: undefined;
-    }>;
+    createScaffold(): Promise<import("../../../../../shared/repository/index.js").DataSourceResponse<import("../../../../../external/backend-api/index.js").TemplateScaffoldResponseModel>>;
     /**
-     * Inserts a new Template on the server
+     * Creates a new Template on the server
      * @param {Template} template
      * @return {*}
      * @memberof UmbTemplateDetailServerDataSource
      */
-    insert(template: CreateTemplateRequestModel): Promise<import("../../../../../shared/repository/index.js").DataSourceResponse<import("../../../../../shared/repository/index.js").DataSourceResponse<string>>>;
+    insert(template: CreateTemplateRequestModel): Promise<import("../../../../../shared/repository/index.js").DataSourceResponse<string>>;
     /**
      * Updates a Template on the server
      * @param {Template} template

package/dist-cms/packages/templating/templates/repository/sources/template.detail.server.data.js

@@ -1,4 +1,3 @@
-import { UmbId } from '../../../../core/id/index.js';
 import { TemplateResource, } from '../../../../../external/backend-api/index.js';
 import { tryExecuteAndNotify } from '../../../../../shared/resources/index.js';
 /**
@@ -24,8 +23,21 @@ export class UmbTemplateDetailServerDataSource {
      * @memberof UmbTemplateDetailServerDataSource
      */
     get(id) {
+        if (!id)
+            throw new Error('Id is missing');
         return tryExecuteAndNotify(this.#host, TemplateResource.getTemplateById({ id }));
     }
+    /**
+     * Gets template item - you can get name and id from that
+     * @param {string} id
+     * @return {*}
+     * @memberof UmbTemplateDetailServerDataSource
+     */
+    async getItem(id) {
+        if (!id)
+            throw new Error('Id is missing');
+        return await tryExecuteAndNotify(this.#host, TemplateResource.getTemplateItem({ id: id }));
+    }
     /**
      * Creates a new Template scaffold
      * @param {(string | null)} parentId
@@ -33,28 +45,10 @@ export class UmbTemplateDetailServerDataSource {
      * @memberof UmbTemplateDetailServerDataSource
      */
     async createScaffold() {
-        const error = undefined;
-        const data = {
-            $type: '',
-            id: UmbId.new(),
-            name: '',
-            alias: '',
-            content: '',
-        };
-        // TODO: update when backend is updated so we don't have to do two calls
-        /*
-        // TODO: Revisit template models, masterTemplateAlias is not here anymore?
-        const { data: scaffoldData, error: scaffoldError } = await tryExecuteAndNotify(
-            this.#host,
-            TemplateResource.getTemplateScaffold()
-        );
-        */
-        //error = scaffoldError;
-        //data.content = scaffoldData?.content || '';
-        return { data, error };
+        return await tryExecuteAndNotify(this.#host, TemplateResource.getTemplateScaffold());
     }
     /**
-     * Inserts a new Template on the server
+     * Creates a new Template on the server
      * @param {Template} template
      * @return {*}
      * @memberof UmbTemplateDetailServerDataSource
@@ -62,7 +56,7 @@ export class UmbTemplateDetailServerDataSource {
     async insert(template) {
         if (!template)
             throw new Error('Template is missing');
-        return tryExecuteAndNotify(this.#host, tryExecuteAndNotify(this.#host, TemplateResource.postTemplate({ requestBody: template })));
+        return await tryExecuteAndNotify(this.#host, TemplateResource.postTemplate({ requestBody: template }));
     }
     /**
      * Updates a Template on the server
@@ -72,10 +66,10 @@ export class UmbTemplateDetailServerDataSource {
      */
     async update(id, template) {
         if (!id)
-            throw new Error('Id is missing');
+            throw new Error('You need to pass template id to update it');
         if (!template)
             throw new Error('Template is missing');
-        return tryExecuteAndNotify(this.#host, TemplateResource.putTemplateById({ id, requestBody: template }));
+        return await tryExecuteAndNotify(this.#host, TemplateResource.putTemplateById({ id, requestBody: template }));
     }
     /**
      * Deletes a Template on the server
@@ -85,7 +79,7 @@ export class UmbTemplateDetailServerDataSource {
      */
     async delete(id) {
         if (!id)
-            throw new Error('Id is missing');
+            throw new Error('You need to pass template id to delete it');
         return await tryExecuteAndNotify(this.#host, TemplateResource.deleteTemplateById({ id }));
     }
 }

package/dist-cms/packages/templating/templates/repository/template.repository.d.ts

@@ -1,7 +1,8 @@
-import type { UmbDetailRepository, UmbTreeRepository } from '../../../../shared/repository/index.js';
+import type { UmbDetailRepository, UmbItemRepository, UmbTreeRepository } from '../../../../shared/repository/index.js';
 import type { UmbControllerHostElement } from '../../../../libs/controller-api/index.js';
-import { CreateTemplateRequestModel, EntityTreeItemResponseModel, TemplateResponseModel, UpdateTemplateRequestModel } from '../../../../external/backend-api/index.js';
-export declare class UmbTemplateRepository implements UmbTreeRepository<EntityTreeItemResponseModel>, UmbDetailRepository<CreateTemplateRequestModel, any, UpdateTemplateRequestModel, TemplateResponseModel> {
+import { CreateTemplateRequestModel, EntityTreeItemResponseModel, ItemResponseModelBaseModel, TemplateItemResponseModel, TemplateResponseModel, UpdateTemplateRequestModel } from '../../../../external/backend-api/index.js';
+import { Observable } from 'rxjs';
+export declare class UmbTemplateRepository implements UmbTreeRepository<EntityTreeItemResponseModel>, UmbDetailRepository<CreateTemplateRequestModel, string, UpdateTemplateRequestModel, TemplateResponseModel>, UmbItemRepository<TemplateItemResponseModel> {
     #private;
     constructor(host: UmbControllerHostElement);
     requestTreeRoot(): Promise<{
@@ -16,28 +17,33 @@ export declare class UmbTemplateRepository implements UmbTreeRepository<EntityTr
     requestRootTreeItems(): Promise<{
         data: import("../../../../shared/repository/index.js").UmbPagedData<EntityTreeItemResponseModel> | undefined;
         error: import("../../../../external/backend-api/index.js").ApiError | import("../../../../external/backend-api/index.js").CancelError | undefined;
-        asObservable: () => import("rxjs").Observable<EntityTreeItemResponseModel[]>;
+        asObservable: () => Observable<EntityTreeItemResponseModel[]>;
     }>;
     requestTreeItemsOf(parentId: string | null): Promise<{
         data: import("../../../../shared/repository/index.js").UmbPagedData<EntityTreeItemResponseModel> | undefined;
         error: import("../../../../external/backend-api/index.js").ApiError | import("../../../../external/backend-api/index.js").CancelError | undefined;
-        asObservable: () => import("rxjs").Observable<EntityTreeItemResponseModel[]>;
+        asObservable: () => Observable<EntityTreeItemResponseModel[]>;
     }>;
     requestItemsLegacy(ids: Array<string>): Promise<{
         data: any[] | undefined;
         error: import("../../../../external/backend-api/index.js").ApiError | import("../../../../external/backend-api/index.js").CancelError | undefined;
-        asObservable: () => import("rxjs").Observable<EntityTreeItemResponseModel[]>;
+        asObservable: () => Observable<EntityTreeItemResponseModel[]>;
     }>;
-    rootTreeItems(): Promise<import("rxjs").Observable<EntityTreeItemResponseModel[]>>;
-    treeItemsOf(parentId: string | null): Promise<import("rxjs").Observable<EntityTreeItemResponseModel[]>>;
-    itemsLegacy(ids: Array<string | null>): Promise<import("rxjs").Observable<EntityTreeItemResponseModel[]>>;
-    createScaffold(parentId: string | null): Promise<import("../../../../shared/repository/index.js").DataSourceResponse<import("../../../../external/backend-api/index.js").TemplateModelBaseModel>>;
+    rootTreeItems(): Promise<Observable<EntityTreeItemResponseModel[]>>;
+    treeItemsOf(parentId: string | null): Promise<Observable<EntityTreeItemResponseModel[]>>;
+    itemsLegacy(ids: Array<string | null>): Promise<Observable<EntityTreeItemResponseModel[]>>;
+    createScaffold(): Promise<import("../../../../shared/repository/index.js").DataSourceResponse<import("../../../../external/backend-api/index.js").TemplateScaffoldResponseModel>>;
     requestById(id: string): Promise<{
         data: TemplateResponseModel | undefined;
         error: import("../../../../external/backend-api/index.js").ApiError | import("../../../../external/backend-api/index.js").CancelError | undefined;
     }>;
-    byId(id: string): Promise<import("rxjs").Observable<any>>;
-    create(template: TemplateResponseModel): Promise<{
+    requestItems(id: string[]): Promise<{
+        data: ItemResponseModelBaseModel[] | undefined;
+        error: import("../../../../external/backend-api/index.js").ApiError | import("../../../../external/backend-api/index.js").CancelError | undefined;
+    }>;
+    items(uniques: string[]): Promise<Observable<ItemResponseModelBaseModel[]>>;
+    byId(id: string): Promise<Observable<any>>;
+    create(template: CreateTemplateRequestModel): Promise<{
         error: import("../../../../external/backend-api/index.js").ApiError | import("../../../../external/backend-api/index.js").CancelError | undefined;
     }>;
     save(id: string, template: UpdateTemplateRequestModel): Promise<{

package/dist-cms/packages/templating/templates/repository/template.repository.js

@@ -1,9 +1,9 @@
-import { UmbTemplateDetailServerDataSource } from './sources/template.detail.server.data.js';
-import { UmbTemplateTreeServerDataSource } from './sources/template.tree.server.data.js';
-import { UMB_TEMPLATE_STORE_CONTEXT_TOKEN } from './template.store.js';
-import { UMB_TEMPLATE_TREE_STORE_CONTEXT_TOKEN } from './template.tree.store.js';
 import { UMB_NOTIFICATION_CONTEXT_TOKEN } from '../../../core/notification/index.js';
 import { UmbContextConsumerController } from '../../../../libs/context-api/index.js';
+import { UMB_TEMPLATE_TREE_STORE_CONTEXT_TOKEN } from './template.tree.store.js';
+import { UMB_TEMPLATE_STORE_CONTEXT_TOKEN } from './template.store.js';
+import { UmbTemplateTreeServerDataSource } from './sources/template.tree.server.data.js';
+import { UmbTemplateDetailServerDataSource } from './sources/template.detail.server.data.js';
 export class UmbTemplateRepository {
     #init;
     #host;
@@ -14,7 +14,6 @@ export class UmbTemplateRepository {
     #notificationContext;
     constructor(host) {
         this.#host = host;
-        // TODO: figure out how spin up get the correct data source
         this.#treeDataSource = new UmbTemplateTreeServerDataSource(this.#host);
         this.#detailDataSource = new UmbTemplateDetailServerDataSource(this.#host);
         this.#init = Promise.all([
@@ -29,7 +28,7 @@ export class UmbTemplateRepository {
             }),
         ]);
     }
-    // TREE:
+    //#region TREE:
     async requestTreeRoot() {
         await this.#init;
         const data = {
@@ -79,12 +78,11 @@ export class UmbTemplateRepository {
         await this.#init;
         return this.#treeStore.items(ids);
     }
-    // DETAILS:
-    async createScaffold(parentId) {
-        if (parentId === undefined)
-            throw new Error('Parent id is missing');
+    //#endregion
+    //#region DETAILS:
+    async createScaffold() {
         await this.#init;
-        return this.#detailDataSource.createScaffold(parentId);
+        return this.#detailDataSource.createScaffold();
     }
     async requestById(id) {
         await this.#init;
@@ -99,6 +97,17 @@ export class UmbTemplateRepository {
         }
         return { data, error };
     }
+    async requestItems(id) {
+        await this.#init;
+        if (!id) {
+            throw new Error('Id is missing');
+        }
+        const { data, error } = await this.#detailDataSource.getItem(id);
+        return { data, error };
+    }
+    async items(uniques) {
+        throw new Error('items method is not implemented in UmbTemplateRepository');
+    }
     async byId(id) {
         if (!id)
             throw new Error('Key is missing');
@@ -108,7 +117,7 @@ export class UmbTemplateRepository {
     // Could potentially be general methods:
     async create(template) {
         await this.#init;
-        if (!template || !template.id) {
+        if (!template) {
             throw new Error('Template is missing');
         }
         const { error } = await this.#detailDataSource.insert(template);
@@ -118,7 +127,7 @@ export class UmbTemplateRepository {
         }
         // TODO: we currently don't use the detail store for anything.
         // Consider to look up the data before fetching from the server
-        this.#store?.append(template);
+        //this.#store?.append({ ...template, $type: 'EntityTreeItemResponseModel' });
         // TODO: Update tree store with the new item? or ask tree to request the new item?
         return { error };
     }
@@ -157,7 +166,6 @@ export class UmbTemplateRepository {
         // Consider notify a workspace if a template is deleted from the store while someone is editing it.
         this.#store?.remove([id]);
         this.#treeStore?.removeItem(id);
-        // TODO: would be nice to align the stores on methods/methodNames.
         return { error };
     }
 }

package/dist-cms/packages/templating/templates/repository/template.store.d.ts

@@ -27,6 +27,7 @@ export declare class UmbTemplateStore extends UmbStoreBase {
      * @memberof UmbTemplateStore
      */
     byId(id: TemplateResponseModel['id']): import("rxjs").Observable<any>;
+    items(uniques: string[]): import("rxjs").Observable<any[]>;
     /**
      * Removes templates in the store with the given uniques
      * @param {string[]} uniques

package/dist-cms/packages/templating/templates/repository/template.store.js

@@ -32,6 +32,9 @@ export class UmbTemplateStore extends UmbStoreBase {
     byId(id) {
         return this._data.getObservablePart((x) => x.find((y) => y.id === id));
     }
+    items(uniques) {
+        return this._data.getObservablePart((x) => x.filter((y) => uniques.includes(y.id)));
+    }
     /**
      * Removes templates in the store with the given uniques
      * @param {string[]} uniques

package/dist-cms/packages/templating/templates/tree/manifests.js

@@ -1,3 +1,4 @@
+import { TEMPLATE_ENTITY_TYPE, TEMPLATE_ROOT_ENTITY_TYPE } from '../index.js';
 import { TEMPLATE_REPOSITORY_ALIAS } from '../repository/manifests.js';
 const tree = {
     type: 'tree',
@@ -13,7 +14,7 @@ const treeItem = {
     alias: 'Umb.TreeItem.Template',
     name: 'Template Tree Item',
     conditions: {
-        entityTypes: ['template-root', 'template'],
+        entityTypes: [TEMPLATE_ROOT_ENTITY_TYPE, TEMPLATE_ENTITY_TYPE],
     },
 };
 export const manifests = [tree, treeItem];

package/dist-cms/packages/templating/templates/workspace/{template-workspace-edit.element.d.ts → template-workspace-editor.element.d.ts}

@@ -1,17 +1,21 @@
 import { UmbLitElement } from '../../../../shared/lit-element/index.js';
-export declare class UmbTemplateWorkspaceEditElement extends UmbLitElement {
+export declare class UmbTemplateWorkspaceEditorElement extends UmbLitElement {
     #private;
     private _name?;
     private _content?;
+    private _alias?;
+    private _ready?;
+    private _masterTemplateName?;
     private _codeEditor?;
+    private inputQuery$;
     constructor();
     private _modalContext?;
     render(): import("lit-html").TemplateResult<1>;
     static styles: import("@lit/reactive-element/css-tag.js").CSSResult[];
 }
-export default UmbTemplateWorkspaceEditElement;
+export default UmbTemplateWorkspaceEditorElement;
 declare global {
     interface HTMLElementTagNameMap {
-        'umb-template-workspace-edit': UmbTemplateWorkspaceEditElement;
+        'umb-template-workspace-editor': UmbTemplateWorkspaceEditorElement;
     }
 }