@umbraco-cms/backoffice 14.0.0-3aaba617 → 14.0.0-41f35ef1

package/dist-cms/custom-elements.json

@@ -658,8 +658,41 @@
     {
       "name": "umb-code-block",
       "path": "./../src/packages/core/components/code-block/code-block.element.ts",
-      "description": "A simple styled box for showing code-based error messages.",
+      "description": "A simple styled box for showing code-based error messages or blocks od code.",
+      "attributes": [
+        {
+          "name": "language",
+          "type": "string",
+          "default": "\"\""
+        },
+        {
+          "name": "copy",
+          "type": "boolean",
+          "default": "false"
+        }
+      ],
       "properties": [
+        {
+          "name": "language",
+          "attribute": "language",
+          "type": "string",
+          "default": "\"\""
+        },
+        {
+          "name": "copy",
+          "attribute": "copy",
+          "type": "boolean",
+          "default": "false"
+        },
+        {
+          "name": "nodes",
+          "type": "NodeListOf<ChildNode>"
+        },
+        {
+          "name": "copyState",
+          "type": "\"idle\" | \"success\"",
+          "default": "\"idle\""
+        },
         {
           "name": "styles",
           "type": "array",
@@ -7162,40 +7195,6 @@
         }
       ]
     },
-    {
-      "name": "umb-insert-value-sidebar",
-      "path": "./../src/packages/templating/modals/insert-value-sidebar.element.ts",
-      "properties": [
-        {
-          "name": "showDefaultValueInput",
-          "type": "boolean",
-          "default": "false"
-        },
-        {
-          "name": "recursive",
-          "type": "boolean",
-          "default": "false"
-        },
-        {
-          "name": "defaultValue",
-          "type": "string | null"
-        },
-        {
-          "name": "field",
-          "type": "string | null"
-        },
-        {
-          "name": "output",
-          "type": "string",
-          "default": "\"\""
-        },
-        {
-          "name": "styles",
-          "type": "array",
-          "default": "[\"UUITextStyles\",null]"
-        }
-      ]
-    },
     {
       "name": "umb-partial-view-picker-modal",
       "path": "./../src/packages/templating/modals/partial-view-picker-modal.element.ts",
@@ -7399,6 +7398,66 @@
         }
       ]
     },
+    {
+      "name": "umb-query-builder-filter",
+      "path": "./../src/packages/templating/templates/modals/query-builder/query-builder-filter.element.ts",
+      "attributes": [
+        {
+          "name": "unremovable",
+          "type": "boolean",
+          "default": "false"
+        }
+      ],
+      "properties": [
+        {
+          "name": "filter",
+          "default": "{}"
+        },
+        {
+          "name": "unremovable",
+          "attribute": "unremovable",
+          "type": "boolean",
+          "default": "false"
+        },
+        {
+          "name": "settings"
+        },
+        {
+          "name": "currentPropertyType"
+        },
+        {
+          "name": "isFilterValid",
+          "type": "boolean"
+        },
+        {
+          "name": "styles",
+          "type": "CSSResult[]",
+          "default": "[\"UUITextStyles\",null]"
+        }
+      ],
+      "events": [
+        {
+          "name": "remove-filter"
+        },
+        {
+          "name": "add-filter"
+        },
+        {
+          "name": "update-query"
+        }
+      ]
+    },
+    {
+      "name": "umb-templating-query-builder-modal",
+      "path": "./../src/packages/templating/templates/modals/query-builder/query-builder.element.ts",
+      "properties": [
+        {
+          "name": "styles",
+          "type": "array",
+          "default": "[\"UUITextStyles\",null]"
+        }
+      ]
+    },
     {
       "name": "umb-template-workspace-editor",
       "path": "./../src/packages/templating/templates/workspace/template-workspace-editor.element.ts",

package/dist-cms/mocks/data/template.data.d.ts

@@ -1,36 +1,18 @@
 import { UmbEntityData } from './entity.data.js';
-import { EntityTreeItemResponseModel, PagedEntityTreeItemResponseModel, TemplateResponseModel, TemplateScaffoldResponseModel, CreateTemplateRequestModel, TemplateItemResponseModel } from '../../external/backend-api/index.js';
+import { EntityTreeItemResponseModel, PagedEntityTreeItemResponseModel, TemplateResponseModel, TemplateScaffoldResponseModel, CreateTemplateRequestModel, TemplateItemResponseModel, TemplateQuerySettingsResponseModel, TemplateQueryResultResponseModel } from '../../external/backend-api/index.js';
 type TemplateDBItem = TemplateResponseModel & EntityTreeItemResponseModel;
 export declare const data: Array<TemplateDBItem>;
 export declare const createTemplateScaffold: (masterTemplateAlias: string) => string;
-export declare const templateQuerySettings: {
-    contentTypeAliases: never[];
-    properties: {
-        alias: string;
-        type: string;
-    }[];
-    operators: {
-        operator: string;
-        applicableTypes: string[];
-    }[];
-};
+export declare const templateQueryResult: TemplateQueryResultResponseModel;
+export declare const templateQuerySettings: TemplateQuerySettingsResponseModel;
 declare class UmbTemplateData extends UmbEntityData<TemplateDBItem> {
     constructor();
     getById(id: string): TemplateResponseModel | undefined;
     getItemById(id: string): TemplateItemResponseModel | null;
     getScaffold(masterTemplateId?: string | null): TemplateScaffoldResponseModel;
     getItems(ids: string[]): TemplateItemResponseModel[];
-    getTemplateQuerySettings: () => {
-        contentTypeAliases: never[];
-        properties: {
-            alias: string;
-            type: string;
-        }[];
-        operators: {
-            operator: string;
-            applicableTypes: string[];
-        }[];
-    };
+    getTemplateQuerySettings: () => TemplateQuerySettingsResponseModel;
+    getTemplateQueryResult: () => TemplateQueryResultResponseModel;
     create(templateData: CreateTemplateRequestModel): {
         name?: string | undefined;
         alias?: string | undefined;

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

@@ -1,6 +1,7 @@
 import { UmbEntityData } from './entity.data.js';
 import { createEntityTreeItem } from './utils.js';
 import { UmbId } from '../../packages/core/id/index.js';
+import { TemplateQueryPropertyTypeModel, OperatorModel, } from '../../external/backend-api/index.js';
 const createTemplate = (dbItem) => {
     return {
         $type: '',
@@ -87,58 +88,79 @@ export const createTemplateScaffold = (masterTemplateAlias) => {
 	Layout = ${masterTemplateAlias};
 }`;
 };
+//prettier-ignore
+const templateQueryExpressions = [
+    `Umbraco.ContentAtRoot().FirstOrDefault()
+.ChildrenOfType("docTypeWithTemplate")
+.Where(x => x.IsVisible())`,
+    `Umbraco.Content(Guid.Parse("0b3498dc-255a-4d62-aa4f-ef7bff333544"))
+.ChildrenOfType("docTypeWithTemplate")
+.Where(x => x.IsVisible())`,
+    `Umbraco.ContentAtRoot().FirstOrDefault()
+.ChildrenOfType("docTypeWithTemplate")
+.Where(x => (x.Id != -6))
+.Where(x => x.IsVisible())
+.OrderBy(x => x.UpdateDate)`,
+];
+const randomIndex = () => Math.floor(Math.random() * 3);
+export const templateQueryResult = {
+    queryExpression: templateQueryExpressions[randomIndex()],
+    sampleResults: [],
+    resultCount: 0,
+    executionTime: 0,
+};
 export const templateQuerySettings = {
-    contentTypeAliases: [],
+    contentTypeAliases: ['docTypeWithTemplate', 'propertyTypeWithTemplate', 'somethingElse'],
     properties: [
         {
             alias: 'Id',
-            type: 'Integer',
+            type: TemplateQueryPropertyTypeModel.INTEGER,
         },
         {
             alias: 'Name',
-            type: 'String',
+            type: TemplateQueryPropertyTypeModel.STRING,
         },
         {
             alias: 'CreateDate',
-            type: 'DateTime',
+            type: TemplateQueryPropertyTypeModel.DATE_TIME,
         },
         {
             alias: 'UpdateDate',
-            type: 'DateTime',
+            type: TemplateQueryPropertyTypeModel.DATE_TIME,
         },
     ],
     operators: [
         {
-            operator: 'Equals',
-            applicableTypes: ['Integer', 'String'],
+            operator: OperatorModel.EQUALS,
+            applicableTypes: [TemplateQueryPropertyTypeModel.INTEGER, TemplateQueryPropertyTypeModel.STRING],
         },
         {
-            operator: 'NotEquals',
-            applicableTypes: ['Integer', 'String'],
+            operator: OperatorModel.NOT_EQUALS,
+            applicableTypes: [TemplateQueryPropertyTypeModel.INTEGER, TemplateQueryPropertyTypeModel.STRING],
         },
         {
-            operator: 'LessThan',
-            applicableTypes: ['Integer', 'DateTime'],
+            operator: OperatorModel.LESS_THAN,
+            applicableTypes: [TemplateQueryPropertyTypeModel.INTEGER, TemplateQueryPropertyTypeModel.DATE_TIME],
         },
         {
-            operator: 'LessThanEqualTo',
-            applicableTypes: ['Integer', 'DateTime'],
+            operator: OperatorModel.GREATER_THAN_EQUAL_TO,
+            applicableTypes: [TemplateQueryPropertyTypeModel.INTEGER, TemplateQueryPropertyTypeModel.DATE_TIME],
         },
         {
-            operator: 'GreaterThan',
-            applicableTypes: ['Integer', 'DateTime'],
+            operator: OperatorModel.GREATER_THAN,
+            applicableTypes: [TemplateQueryPropertyTypeModel.INTEGER, TemplateQueryPropertyTypeModel.DATE_TIME],
         },
         {
-            operator: 'GreaterThanEqualTo',
-            applicableTypes: ['Integer', 'DateTime'],
+            operator: OperatorModel.GREATER_THAN_EQUAL_TO,
+            applicableTypes: [TemplateQueryPropertyTypeModel.INTEGER, TemplateQueryPropertyTypeModel.DATE_TIME],
         },
         {
-            operator: 'Contains',
-            applicableTypes: ['String'],
+            operator: OperatorModel.CONTAINS,
+            applicableTypes: [TemplateQueryPropertyTypeModel.STRING],
         },
         {
-            operator: 'NotContains',
-            applicableTypes: ['String'],
+            operator: OperatorModel.NOT_CONTAINS,
+            applicableTypes: [TemplateQueryPropertyTypeModel.STRING],
         },
     ],
 };
@@ -147,6 +169,7 @@ class UmbTemplateData extends UmbEntityData {
     constructor() {
         super(data);
         this.getTemplateQuerySettings = () => templateQuerySettings;
+        this.getTemplateQueryResult = () => templateQueryResult;
     }
     getById(id) {
         const item = this.data.find((item) => item.id === id);

package/dist-cms/mocks/handlers/template.handlers.js

@@ -39,6 +39,10 @@ export const handlers = [
         const response = umbTemplateData.getTemplateQuerySettings();
         return res(ctx.status(200), ctx.json(response));
     }),
+    rest.post(umbracoPath('/template/query/execute'), (req, res, ctx) => {
+        const response = umbTemplateData.getTemplateQueryResult();
+        return res(ctx.status(200), ctx.json(response));
+    }),
     rest.get(umbracoPath('/template/:id'), (req, res, ctx) => {
         const id = req.params.id;
         if (!id)

package/dist-cms/packages/core/components/button-with-dropdown/button-with-dropdown.element.d.ts

@@ -10,6 +10,8 @@ export declare class UmbButtonWithDropdownElement extends LitElement {
     compact: boolean;
     symbolExpand: UUISymbolExpandElement;
     popover: UUIPopoverElement;
+    openPopover(): void;
+    closePopover(): void;
     render(): import("lit-html").TemplateResult<1>;
     static styles: import("@lit/reactive-element/css-tag").CSSResult[];
 }

package/dist-cms/packages/core/components/button-with-dropdown/button-with-dropdown.element.js

@@ -18,22 +18,22 @@ export let UmbButtonWithDropdownElement = class UmbButtonWithDropdownElement ext
         this.placement = 'bottom-start';
         this.compact = false;
     }
-    #openPopover() {
+    openPopover() {
         this.open = true;
         this.popover.open = true;
         this.symbolExpand.open = true;
     }
-    #closePopover() {
+    closePopover() {
         this.open = false;
         this.popover.open = false;
         this.symbolExpand.open = false;
     }
     #togglePopover() {
-        this.open ? this.#closePopover() : this.#openPopover();
+        this.open ? this.closePopover() : this.openPopover();
     }
     render() {
         return html `
-			<uui-popover placement=${this.placement} id="popover" @close=${this.#closePopover}>
+			<uui-popover placement=${this.placement} id="popover" @close=${this.closePopover}>
 				<uui-button
 					slot="trigger"
 					.look=${this.look}

package/dist-cms/packages/core/components/code-block/code-block.element.d.ts

@@ -1,10 +1,15 @@
 import { LitElement } from '../../../../external/lit/index.js';
 /**
- *  A simple styled box for showing code-based error messages.
+ *  A simple styled box for showing code-based error messages or blocks od code.
  *  @slot the full message
  *
  */
 export declare class UmbCodeBlockElement extends LitElement {
+    language: string;
+    copy: boolean;
+    nodes: NodeListOf<ChildNode>;
+    copyState: 'idle' | 'success';
+    copyCode(): Promise<void>;
     render(): import("lit-html").TemplateResult<1>;
     static styles: import("@lit/reactive-element/css-tag").CSSResult[];
 }

package/dist-cms/packages/core/components/code-block/code-block.element.js

@@ -5,54 +5,128 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import { UUITextStyles } from '../../../../external/uui/index.js';
-import { css, html, LitElement, customElement } from '../../../../external/lit/index.js';
+import { css, html, LitElement, customElement, property, queryAssignedNodes, state, } from '../../../../external/lit/index.js';
+//TODO consider adding a highlight prop to the code block, that could spin up/access monaco instance and highlight the code
 /**
- *  A simple styled box for showing code-based error messages.
+ *  A simple styled box for showing code-based error messages or blocks od code.
  *  @slot the full message
  *
  */
 export let UmbCodeBlockElement = class UmbCodeBlockElement extends LitElement {
+    constructor() {
+        super(...arguments);
+        this.language = '';
+        this.copy = false;
+        this.copyState = 'idle';
+    }
+    async copyCode() {
+        const text = this.textContent;
+        if (text) {
+            await navigator.clipboard.writeText(text);
+            this.copyState = 'success';
+            setTimeout(() => {
+                this.copyState = 'idle';
+            }, 2000);
+        }
+    }
     render() {
-        return html `<div id="container">
-			<uui-scroll-container>
-				<pre>
+        return html `
+			${this.language
+            ? html `<div id="header">
+						<span id="lang">${this.language}</span> ${this.copy
+                ? html `<button @click=${this.copyCode}>
+									${this.copyState === 'idle'
+                    ? html `<uui-icon name="copy"></uui-icon>Copy`
+                    : html `<uui-icon name="check"></uui-icon>Copied!`}
+							  </button>`
+                : ''}
+				  </div>`
+            : ''}
+			<pre style="${this.language ? 'border-top: 1px solid var(--uui-color-divider-emphasis);' : ''}">
+				<uui-scroll-container>
 					<code>
 						<slot></slot>
 					</code>
+					</uui-scroll-container>
 				</pre>
-			</uui-scroll-container>
-		</div> `;
+		`;
     }
     static { this.styles = [
         UUITextStyles,
         css `
 			:host {
 				display: block;
-				font-family: monospace;
-			}
-
-			#container {
 				border: 1px solid var(--uui-color-divider-emphasis);
-				color: var(--uui-color-text-alt);
-				background-color: var(--uui-color-divider-standalone);
-				padding: var(--uui-size-space-2);
 				border-radius: var(--uui-border-radius);
-				line-height: var(--uui-size-10);
 			}
-			:host uui-scroll-container {
+
+			uui-scroll-container {
 				max-height: 500px;
 				overflow-y: auto;
 				overflow-wrap: anywhere;
 			}
+
 			pre {
-				max-width: 100%;
+				font-family: monospace;
+				background-color: var(--uui-color-surface-alt);
+				color: #303033;
+				display: block;
+				font-family: Lato, Helvetica Neue, Helvetica, Arial, sans-serif;
+				margin: 0;
+				overflow-x: auto;
+				padding: 9.5px;
+			}
+
+			pre,
+			code {
+				word-wrap: normal;
 				white-space: pre-line;
-				word-break: break-word;
-				overflow-wrap: break-word;
+			}
+
+			#header {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				background-color: var(--uui-color-surface-alt);
+			}
+
+			#lang {
+				margin-left: 16px;
+				font-weight: bold;
+				text-transform: uppercase;
+			}
+
+			button {
+				font-family: inherit;
+				padding: 6px 16px;
+				background-color: transparent;
+				border: none;
+				border-left: 1px solid var(--uui-color-divider-emphasis);
+				border-radius: 0;
+				color: #000;
+				display: flex;
+				align-items: center;
+				gap: 8px;
+			}
+
+			button:hover {
+				background-color: var(--uui-color-surface-emphasis);
 			}
 		`,
     ]; }
 };
+__decorate([
+    property()
+], UmbCodeBlockElement.prototype, "language", void 0);
+__decorate([
+    property({ type: Boolean })
+], UmbCodeBlockElement.prototype, "copy", void 0);
+__decorate([
+    queryAssignedNodes()
+], UmbCodeBlockElement.prototype, "nodes", void 0);
+__decorate([
+    state()
+], UmbCodeBlockElement.prototype, "copyState", void 0);
 UmbCodeBlockElement = __decorate([
     customElement('umb-code-block')
 ], UmbCodeBlockElement);

package/dist-cms/packages/core/components/index.d.ts

@@ -2,6 +2,7 @@ export * from './backoffice-modal-container/backoffice-modal-container.element.j
 export * from './backoffice-notification-container/backoffice-notification-container.element.js';
 export * from './body-layout/body-layout.element.js';
 export * from './button-with-dropdown/button-with-dropdown.element.js';
+export * from './code-block/index.js';
 export * from './data-type/index.js';
 export * from './input-date/index.js';
 export * from './dropdown/index.js';

package/dist-cms/packages/core/components/index.js

@@ -4,7 +4,7 @@ export * from './backoffice-modal-container/backoffice-modal-container.element.j
 export * from './backoffice-notification-container/backoffice-notification-container.element.js';
 export * from './body-layout/body-layout.element.js';
 export * from './button-with-dropdown/button-with-dropdown.element.js'; // TODO: delete this and change usage to umb-dropdown
-// export * from './code-block.js';
+export * from './code-block/index.js';
 export * from './data-type/index.js';
 export * from './input-date/index.js';
 export * from './dropdown/index.js';

package/dist-cms/packages/core/modal/token/dictionary-item-picker-modal.token.d.ts

@@ -2,5 +2,4 @@ import type { EntityTreeItemResponseModel } from '../../../../external/backend-a
 import { UmbModalToken, UmbPickerModalResult, UmbTreePickerModalData } from '../index.js';
 export type UmbDictionaryItemPickerModalData = UmbTreePickerModalData<EntityTreeItemResponseModel>;
 export type UmbDictionaryItemPickerModalResult = UmbPickerModalResult;
-export declare const UMB_DICTIONARY_ITEM_PICKER_MODAL_ALIAS = "Umb.Modal.DictionaryItemPicker";
 export declare const UMB_DICTIONARY_ITEM_PICKER_MODAL: UmbModalToken<UmbDictionaryItemPickerModalData, UmbPickerModalResult>;

package/dist-cms/packages/core/modal/token/dictionary-item-picker-modal.token.js

@@ -1,6 +1,5 @@
 import { UmbModalToken } from '../index.js';
-export const UMB_DICTIONARY_ITEM_PICKER_MODAL_ALIAS = 'Umb.Modal.DictionaryItemPicker';
-export const UMB_DICTIONARY_ITEM_PICKER_MODAL = new UmbModalToken(UMB_DICTIONARY_ITEM_PICKER_MODAL_ALIAS, {
+export const UMB_DICTIONARY_ITEM_PICKER_MODAL = new UmbModalToken('Umb.Modal.TreePicker', {
     type: 'sidebar',
     size: 'small',
 }, {

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

@@ -1,4 +1,3 @@
-import { map } from '../../../external/rxjs/index.js';
 import { umbExtensionsRegistry } from '../extension-registry/index.js';
 import { UmbBooleanState } from '../../../libs/observable-api/index.js';
 import { UmbBaseController } from '../../../libs/controller-api/index.js';
@@ -36,9 +35,7 @@ export class UmbTreeContextBase extends UmbBaseController {
         if (this.#treeAlias === treeAlias)
             return;
         this.#treeAlias = treeAlias;
-        if (treeAlias) {
-            this.#observeTreeManifest();
-        }
+        this.#observeTreeManifest();
     }
     getTreeAlias() {
         return this.#treeAlias;
@@ -94,13 +91,13 @@ export class UmbTreeContextBase extends UmbBaseController {
         return this.repository.treeItemsOf(parentUnique);
     }
     #observeTreeManifest() {
-        this.observe(umbExtensionsRegistry
-            .extensionsOfType('tree')
-            .pipe(map((treeManifests) => treeManifests.find((treeManifest) => treeManifest.alias === this.#treeAlias))), async (treeManifest) => {
-            if (!treeManifest)
-                return;
-            this.#observeRepository(treeManifest);
-        }, '_observeTreeManifest');
+        if (this.#treeAlias) {
+            this.observe(umbExtensionsRegistry.getByTypeAndAlias('tree', this.#treeAlias), async (treeManifest) => {
+                if (!treeManifest)
+                    return;
+                this.#observeRepository(treeManifest);
+            }, '_observeTreeManifest');
+        }
     }
     #observeRepository(treeManifest) {
         const repositoryAlias = treeManifest.meta.repositoryAlias;