@umbraco-cms/backoffice 14.0.0--preview005-cfee2c6f → 14.0.0--preview005-c0d3d16d

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

@@ -28,7 +28,7 @@ export const data = [
                     blocks: {},
                     markup: `
 						<p>
-							Some value for the RTE with an <a href="https://google.com">external link</a> and an <a href="/{localLink:umb://document/c05da24d7740447b9cdcbd8ce2172e38}">internal link</a> foo foo
+							Some value for the RTE with an <a href="https://google.com">external link</a> and an <a type="document" href="/{localLink:c05da24d-7740-447b-9cdc-bd8ce2172e38}">internal link</a> foo foo
 						</p>
 						<div class="umb-macro-holder TestMacro umb-macro-mce_1 mceNonEditable"><!-- <?UMBRACO_MACRO macroAlias="TestMacro" /> --><ins>Macro alias: <strong>TestMacro</strong></ins></div>
 						<p>The following tests the embed plugin:</p>

package/dist-cms/packages/core/components/input-multi-url/input-multi-url.element.js

@@ -7,7 +7,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 import { css, html, customElement, property, state } from '../../../../external/lit/index.js';
 import { FormControlMixin } from '../../../../external/uui/index.js';
 import { UmbLitElement } from '../../../../shared/lit-element/index.js';
-import { UMB_LINK_PICKER_MODAL, UmbModalRouteRegistrationController, } from '../../modal/index.js';
+import { UMB_LINK_PICKER_MODAL, UmbModalRouteRegistrationController } from '../../modal/index.js';
 /**
  * @element umb-input-multi-url
  * @fires change - when the value of the input changes
@@ -91,7 +91,8 @@ let UmbInputMultiUrlElement = class UmbInputMultiUrlElement extends FormControlM
                         queryString: data?.queryString,
                         target: data?.target,
                         trashed: data?.trashed,
-                        udi: data?.udi,
+                        type: data?.type,
+                        unique: data?.unique,
                         url: data?.url,
                     },
                 },

package/dist-cms/packages/core/modal/common/link-picker/link-picker-modal.element.js

@@ -12,7 +12,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _UmbLinkPickerModalElement_instances, _UmbLinkPickerModalElement_handleQueryString, _UmbLinkPickerModalElement_handleSelectionChange, _UmbLinkPickerModalElement_partialUpdateLink;
 import { css, html, nothing, customElement, query, state, styleMap } from '../../../../../external/lit/index.js';
 import { UmbModalBaseElement } from '../../index.js';
-import { buildUdi, getKeyFromUdi } from '../../../../../shared/utils/index.js';
 import { UMB_DOCUMENT_TREE_ALIAS } from '../../../../documents/documents/index.js';
 let UmbLinkPickerModalElement = class UmbLinkPickerModalElement extends UmbModalBaseElement {
     constructor() {
@@ -41,7 +40,7 @@ let UmbLinkPickerModalElement = class UmbLinkPickerModalElement extends UmbModal
         if (this.modalContext) {
             this.observe(this.modalContext.value, (value) => {
                 this._link = value.link;
-                this._selectedKey = this._link?.udi ? getKeyFromUdi(this._link.udi) : undefined;
+                this._selectedKey = this._link?.unique ?? undefined;
                 this._selectionConfiguration.selection = this._selectedKey ? [this._selectedKey] : [];
             });
         }
@@ -92,9 +91,9 @@ let UmbLinkPickerModalElement = class UmbLinkPickerModalElement extends UmbModal
 				id="link-input"
 				placeholder=${this.localize.term('general_url')}
 				label=${this.localize.term('general_url')}
-				.value="${this._link.udi ?? this._link.url ?? ''}"
-				@input=${() => __classPrivateFieldGet(this, _UmbLinkPickerModalElement_instances, "m", _UmbLinkPickerModalElement_partialUpdateLink).call(this, { url: this._linkInput.value })}
-				?disabled="${this._link.udi ? true : false}"></uui-input>
+				.value="${this._link.unique ?? this._link.url ?? ''}"
+				@input=${() => __classPrivateFieldGet(this, _UmbLinkPickerModalElement_instances, "m", _UmbLinkPickerModalElement_partialUpdateLink).call(this, { type: 'external', url: this._linkInput.value })}
+				?disabled="${this._link.unique ? true : false}"></uui-input>
 		</span>`;
     }
     _renderAnchorInput() {
@@ -168,16 +167,16 @@ _UmbLinkPickerModalElement_handleSelectionChange = function _UmbLinkPickerModalE
     const selection = element.getSelection();
     const selectedKey = selection[selection.length - 1];
     if (!selectedKey) {
-        __classPrivateFieldGet(this, _UmbLinkPickerModalElement_instances, "m", _UmbLinkPickerModalElement_partialUpdateLink).call(this, { udi: '', url: undefined });
+        __classPrivateFieldGet(this, _UmbLinkPickerModalElement_instances, "m", _UmbLinkPickerModalElement_partialUpdateLink).call(this, { type: undefined, unique: '', url: undefined });
         this._selectedKey = undefined;
         this._selectionConfiguration.selection = [];
         this.requestUpdate();
         return;
     }
-    const udi = buildUdi(entityType, selectedKey);
+    const linkType = entityType ?? 'external';
     this._selectedKey = selectedKey;
     this._selectionConfiguration.selection = [this._selectedKey];
-    __classPrivateFieldGet(this, _UmbLinkPickerModalElement_instances, "m", _UmbLinkPickerModalElement_partialUpdateLink).call(this, { udi: udi, url: udi });
+    __classPrivateFieldGet(this, _UmbLinkPickerModalElement_instances, "m", _UmbLinkPickerModalElement_partialUpdateLink).call(this, { type: linkType, unique: selectedKey, url: selectedKey });
     this.requestUpdate();
 };
 _UmbLinkPickerModalElement_partialUpdateLink = function _UmbLinkPickerModalElement_partialUpdateLink(linkObject) {

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

@@ -14,9 +14,11 @@ export interface UmbLinkPickerLink {
     queryString?: string | null;
     target?: string | null;
     trashed?: boolean | null;
-    udi?: string | null;
+    type?: UmbLinkPickerLinkType | null;
+    unique?: string | null;
     url?: string | null;
 }
+export type UmbLinkPickerLinkType = 'document' | 'external' | 'media';
 export interface UmbLinkPickerConfig {
     hideAnchor?: boolean;
     ignoreUserStartNodes?: boolean;

package/dist-cms/packages/core/property-editor/uis/tiny-mce/plugins/tiny-mce-linkpicker.plugin.js

@@ -66,7 +66,7 @@ class UmbTinyMceLinkPickerPlugin extends UmbTinyMcePluginBase {
         };
         if (__classPrivateFieldGet(this, _UmbTinyMceLinkPickerPlugin_anchorElement, "f").href.includes('localLink:')) {
             const href = __classPrivateFieldGet(this, _UmbTinyMceLinkPickerPlugin_anchorElement, "f").getAttribute('href');
-            currentTarget.udi = href.split('localLink:')[1].slice(0, -1);
+            currentTarget.unique = href.split('localLink:')[1].slice(0, -1);
         }
         else if (__classPrivateFieldGet(this, _UmbTinyMceLinkPickerPlugin_anchorElement, "f").host.length) {
             currentTarget.url = __classPrivateFieldGet(this, _UmbTinyMceLinkPickerPlugin_anchorElement, "f").protocol ? __classPrivateFieldGet(this, _UmbTinyMceLinkPickerPlugin_anchorElement, "f").protocol + '//' : undefined;
@@ -152,13 +152,13 @@ _UmbTinyMceLinkPickerPlugin_modalContext = new WeakMap(), _UmbTinyMceLinkPickerP
             __classPrivateFieldGet(this, _UmbTinyMceLinkPickerPlugin_linkPickerData, "f").link.queryString = urlParts[1] + urlParts[2];
         }
     }
-    if (!__classPrivateFieldGet(this, _UmbTinyMceLinkPickerPlugin_linkPickerData, "f")?.link.url && !__classPrivateFieldGet(this, _UmbTinyMceLinkPickerPlugin_linkPickerData, "f")?.link.queryString && !__classPrivateFieldGet(this, _UmbTinyMceLinkPickerPlugin_linkPickerData, "f")?.link.udi) {
+    if (!__classPrivateFieldGet(this, _UmbTinyMceLinkPickerPlugin_linkPickerData, "f")?.link.url && !__classPrivateFieldGet(this, _UmbTinyMceLinkPickerPlugin_linkPickerData, "f")?.link.queryString && !__classPrivateFieldGet(this, _UmbTinyMceLinkPickerPlugin_linkPickerData, "f")?.link.unique) {
         this.editor.execCommand('unlink');
         return;
     }
     //if we have an id, it must be a locallink:id
-    if (__classPrivateFieldGet(this, _UmbTinyMceLinkPickerPlugin_linkPickerData, "f")?.link.udi) {
-        __classPrivateFieldGet(this, _UmbTinyMceLinkPickerPlugin_linkPickerData, "f").link.url = '/{localLink:' + __classPrivateFieldGet(this, _UmbTinyMceLinkPickerPlugin_linkPickerData, "f").link.udi + '}';
+    if (__classPrivateFieldGet(this, _UmbTinyMceLinkPickerPlugin_linkPickerData, "f")?.link.unique) {
+        __classPrivateFieldGet(this, _UmbTinyMceLinkPickerPlugin_linkPickerData, "f").link.url = '/{localLink:' + __classPrivateFieldGet(this, _UmbTinyMceLinkPickerPlugin_linkPickerData, "f").link.unique + '}';
         __classPrivateFieldGet(this, _UmbTinyMceLinkPickerPlugin_instances, "m", _UmbTinyMceLinkPickerPlugin_insertLink).call(this);
         return;
     }

package/dist-cms/packages/templating/templates/modals/query-builder/query-builder.element.js

@@ -139,12 +139,13 @@ let UmbChooseInsertTypeModalElement = class UmbChooseInsertTypeModalElement exte
 								  </uui-button>`
             : ''}
 						</div>
-						<div class="row">
+						<div class="row query-results">
 							<span id="results-count">
 								${this._templateQuery?.resultCount ?? 0}
 								<umb-localize key="template_itemsReturned">items returned, in</umb-localize>
 								${this._templateQuery?.executionTime ?? 0} ms
 							</span>
+							${this._templateQuery?.sampleResults.map((sample) => html `<span><uui-icon name=${sample.icon}></uui-icon>${sample.name}</span>`) ?? ''}
 						</div>
 						<umb-code-block language="C#" copy>${this._templateQuery?.queryExpression ?? ''}</umb-code-block>
 					</uui-box>
@@ -279,6 +280,16 @@ UmbChooseInsertTypeModalElement.styles = [
 			#results-count {
 				font-weight: bold;
 			}
+			.query-results {
+				flex-direction: column;
+				align-items: flex-start;
+				gap: 0;
+			}
+			.query-results span {
+				display: flex;
+				align-items: center;
+				gap: var(--uui-size-1);
+			}
 		`,
 ];
 __decorate([