@umbraco-cms/backoffice 14.0.0--preview005-f1b84a48 → 14.0.0--preview005-011edded

package/dist-cms/assets/lang/da-dk.js

@@ -2968,7 +2968,7 @@ export default {
         analyticsDescription: '\n      In order to improve Umbraco and add new functionality based on as relevant information as possible,\n          <br>we would like to collect system- and usage information from your installation.\n          <br>Aggregate data will be shared on a regular basis as well as learnings from these metrics.\n          <br>Hopefully, you will help us collect some valuable data.\n          <br>\n          <br>We <strong>WILL NOT</strong> collect any personal data such as content, code, user information, and all data will be fully anonymized.\n       ',
         minimalLevelDescription: 'We will only send an anonymized site ID to let us know that the site exists.',
         basicLevelDescription: 'We will send an anonymized site ID, Umbraco version, and packages installed',
-        detailedLevelDescription: '\n          We will send:\n          <ul>\n            <li>Anonymized site ID, Umbraco version, and packages installed.</li>\n            <li>Number of: Root nodes, Content nodes, Macros, Media, Document Types, Templates, Languages, Domains, User Group, Users, Members, Backoffice external login providers, and Property Editors in use.</li>\n            <li>System information: Webserver, server OS, server framework, server OS language, and database provider.</li>\n            <li>Configuration settings: Modelsbuilder mode, if custom Umbraco path exists, ASP environment, whether the delivery API is enabled, and allows public access, and if you are in debug mode.</li>\n          </ul>\n          <em>We might change what we send on the Detailed level in the future. If so, it will be listed above.\n          <br>By choosing "Detailed" you agree to current and future anonymized information being collected.</em>\n       ',
+        detailedLevelDescription: '\n          We will send:\n          <ul>\n            <li>Anonymized site ID, Umbraco version, and packages installed.</li>\n            <li>Number of: Root nodes, Content nodes, Media, Document Types, Templates, Languages, Domains, User Group, Users, Members, Backoffice external login providers, and Property Editors in use.</li>\n            <li>System information: Webserver, server OS, server framework, server OS language, and database provider.</li>\n            <li>Configuration settings: Modelsbuilder mode, if custom Umbraco path exists, ASP environment, whether the delivery API is enabled, and allows public access, and if you are in debug mode.</li>\n          </ul>\n          <em>We might change what we send on the Detailed level in the future. If so, it will be listed above.\n          <br>By choosing "Detailed" you agree to current and future anonymized information being collected.</em>\n       ',
     },
     umbId: {
         editProfile: 'Edit your Umbraco ID profile',

package/dist-cms/assets/lang/da-dk.ts

@@ -3217,7 +3217,7 @@ export default {
 		minimalLevelDescription: 'We will only send an anonymized site ID to let us know that the site exists.',
 		basicLevelDescription: 'We will send an anonymized site ID, Umbraco version, and packages installed',
 		detailedLevelDescription:
-			'\n          We will send:\n          <ul>\n            <li>Anonymized site ID, Umbraco version, and packages installed.</li>\n            <li>Number of: Root nodes, Content nodes, Macros, Media, Document Types, Templates, Languages, Domains, User Group, Users, Members, Backoffice external login providers, and Property Editors in use.</li>\n            <li>System information: Webserver, server OS, server framework, server OS language, and database provider.</li>\n            <li>Configuration settings: Modelsbuilder mode, if custom Umbraco path exists, ASP environment, whether the delivery API is enabled, and allows public access, and if you are in debug mode.</li>\n          </ul>\n          <em>We might change what we send on the Detailed level in the future. If so, it will be listed above.\n          <br>By choosing "Detailed" you agree to current and future anonymized information being collected.</em>\n       ',
+			'\n          We will send:\n          <ul>\n            <li>Anonymized site ID, Umbraco version, and packages installed.</li>\n            <li>Number of: Root nodes, Content nodes, Media, Document Types, Templates, Languages, Domains, User Group, Users, Members, Backoffice external login providers, and Property Editors in use.</li>\n            <li>System information: Webserver, server OS, server framework, server OS language, and database provider.</li>\n            <li>Configuration settings: Modelsbuilder mode, if custom Umbraco path exists, ASP environment, whether the delivery API is enabled, and allows public access, and if you are in debug mode.</li>\n          </ul>\n          <em>We might change what we send on the Detailed level in the future. If so, it will be listed above.\n          <br>By choosing "Detailed" you agree to current and future anonymized information being collected.</em>\n       ',
 	},
 	umbId: {
 		editProfile: 'Edit your Umbraco ID profile',

package/dist-cms/assets/lang/en-us.js

@@ -2266,7 +2266,7 @@ export default {
         analyticsDescription: '\n      In order to improve Umbraco and add new functionality based on as relevant information as possible,\n          <br>we would like to collect system- and usage information from your installation.\n          <br>Aggregate data will be shared on a regular basis as well as learnings from these metrics.\n          <br>Hopefully, you will help us collect some valuable data.\n          <br>\n          <br>We <strong>WILL NOT</strong> collect any personal data such as content, code, user information, and all data will be fully anonymized.\n       ',
         minimalLevelDescription: 'We will only send an anonymized site ID to let us know that the site exists.',
         basicLevelDescription: 'We will send an anonymized site ID, Umbraco version, and packages installed',
-        detailedLevelDescription: '\n          We will send:\n          <ul>\n            <li>Anonymized site ID, Umbraco version, and packages installed.</li>\n            <li>Number of: Root nodes, Content nodes, Macros, Media, Document Types, Templates, Languages, Domains, User Group, Users, Members, Backoffice external login providers, and Property Editors in use.</li>\n            <li>System information: Webserver, server OS, server framework, server OS language, and database provider.</li>\n            <li>Configuration settings: Modelsbuilder mode, if custom Umbraco path exists, ASP environment, whether the delivery API is enabled, and allows public access, and if you are in debug mode.</li>\n          </ul>\n          <em>We might change what we send on the Detailed level in the future. If so, it will be listed above.\n          <br>By choosing "Detailed" you agree to current and future anonymized information being collected.</em>\n       ',
+        detailedLevelDescription: '\n          We will send:\n          <ul>\n            <li>Anonymized site ID, Umbraco version, and packages installed.</li>\n            <li>Number of: Root nodes, Content nodes, Media, Document Types, Templates, Languages, Domains, User Group, Users, Members, Backoffice external login providers, and Property Editors in use.</li>\n            <li>System information: Webserver, server OS, server framework, server OS language, and database provider.</li>\n            <li>Configuration settings: Modelsbuilder mode, if custom Umbraco path exists, ASP environment, whether the delivery API is enabled, and allows public access, and if you are in debug mode.</li>\n          </ul>\n          <em>We might change what we send on the Detailed level in the future. If so, it will be listed above.\n          <br>By choosing "Detailed" you agree to current and future anonymized information being collected.</em>\n       ',
     },
     umbId: {
         editProfile: 'Edit your Umbraco ID profile',

package/dist-cms/assets/lang/en-us.ts

@@ -1522,7 +1522,7 @@ export default {
 		addGroup: 'Add group',
 		inheritedFrom: 'Inherited from',
 		addProperty: 'Add property',
-		editProperty : 'Edit property',
+		editProperty: 'Edit property',
 		requiredLabel: 'Required label',
 		enableListViewHeading: 'Enable list view',
 		enableListViewDescription:
@@ -2470,7 +2470,7 @@ export default {
 		minimalLevelDescription: 'We will only send an anonymized site ID to let us know that the site exists.',
 		basicLevelDescription: 'We will send an anonymized site ID, Umbraco version, and packages installed',
 		detailedLevelDescription:
-			'\n          We will send:\n          <ul>\n            <li>Anonymized site ID, Umbraco version, and packages installed.</li>\n            <li>Number of: Root nodes, Content nodes, Macros, Media, Document Types, Templates, Languages, Domains, User Group, Users, Members, Backoffice external login providers, and Property Editors in use.</li>\n            <li>System information: Webserver, server OS, server framework, server OS language, and database provider.</li>\n            <li>Configuration settings: Modelsbuilder mode, if custom Umbraco path exists, ASP environment, whether the delivery API is enabled, and allows public access, and if you are in debug mode.</li>\n          </ul>\n          <em>We might change what we send on the Detailed level in the future. If so, it will be listed above.\n          <br>By choosing "Detailed" you agree to current and future anonymized information being collected.</em>\n       ',
+			'\n          We will send:\n          <ul>\n            <li>Anonymized site ID, Umbraco version, and packages installed.</li>\n            <li>Number of: Root nodes, Content nodes, Media, Document Types, Templates, Languages, Domains, User Group, Users, Members, Backoffice external login providers, and Property Editors in use.</li>\n            <li>System information: Webserver, server OS, server framework, server OS language, and database provider.</li>\n            <li>Configuration settings: Modelsbuilder mode, if custom Umbraco path exists, ASP environment, whether the delivery API is enabled, and allows public access, and if you are in debug mode.</li>\n          </ul>\n          <em>We might change what we send on the Detailed level in the future. If so, it will be listed above.\n          <br>By choosing "Detailed" you agree to current and future anonymized information being collected.</em>\n       ',
 	},
 	umbId: {
 		editProfile: 'Edit your Umbraco ID profile',

package/dist-cms/css/rte-content.css

@@ -0,0 +1,49 @@
+.umb-macro-holder {
+	border: 3px dotted red;
+	padding: 7px;
+	margin: 3px;
+	display: block;
+	position: relative;
+}
+
+.umb-macro-holder::after {
+	content: 'Macros are no longer supported. Please use the block picker instead.';
+	position: absolute;
+	top: 50%;
+	left: 50%;
+	transform: translate(-50%, -50%);
+	color: white;
+	background-color: rgba(0, 0, 0, 0.7);
+	padding: 10px;
+	border-radius: 5px;
+}
+
+.umb-embed-holder {
+	position: relative;
+}
+
+.umb-embed-holder > * {
+	user-select: none;
+	pointer-events: none;
+}
+
+.umb-embed-holder[data-mce-selected] {
+	outline: 2px solid var(--uui-palette-spanish-pink-light);
+}
+
+.umb-embed-holder::before {
+	z-index: 1000;
+	width: 100%;
+	height: 100%;
+	position: absolute;
+	content: ' ';
+}
+
+.umb-embed-holder[data-mce-selected]::before {
+	background: rgba(0, 0, 0, 0.025);
+}
+
+*[data-mce-selected='inline-boundary'] {
+	background: rgba(0, 0, 0, 0.025);
+	outline: 2px solid var(--uui-palette-spanish-pink-light);
+}

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

@@ -716,7 +716,7 @@ export const data = [
                 value: '+a[id|style|rel|data-id|data-udi|rev|charset|hreflang|dir|lang|tabindex|accesskey|type|name|href|target|title|class|onfocus|onblur|onclick|ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup],-strong/-b[class|style],-em/-i[class|style],-strike[class|style],-s[class|style],-u[class|style],#p[id|style|dir|class|align],-ol[class|reversed|start|style|type],-ul[class|style],-li[class|style],br[class],img[id|dir|lang|longdesc|usemap|style|class|src|onmouseover|onmouseout|border|alt=|title|hspace|vspace|width|height|align|umbracoorgwidth|umbracoorgheight|onresize|onresizestart|onresizeend|rel|data-id],-sub[style|class],-sup[style|class],-blockquote[dir|style|class],-table[border=0|cellspacing|cellpadding|width|height|class|align|summary|style|dir|id|lang|bgcolor|background|bordercolor],-tr[id|lang|dir|class|rowspan|width|height|align|valign|style|bgcolor|background|bordercolor],tbody[id|class],thead[id|class],tfoot[id|class],#td[id|lang|dir|class|colspan|rowspan|width|height|align|valign|style|bgcolor|background|bordercolor|scope],-th[id|lang|dir|class|colspan|rowspan|width|height|align|valign|style|scope],caption[id|lang|dir|class|style],-div[id|dir|class|align|style],-span[class|align|style],-pre[class|align|style],address[class|align|style],-h1[id|dir|class|align|style],-h2[id|dir|class|align|style],-h3[id|dir|class|align|style],-h4[id|dir|class|align|style],-h5[id|dir|class|align|style],-h6[id|style|dir|class|align|style],hr[class|style],small[class|style],dd[id|class|title|style|dir|lang],dl[id|class|title|style|dir|lang],dt[id|class|title|style|dir|lang],object[class|id|width|height|codebase|*],param[name|value|_value|class],embed[type|width|height|src|class|*],map[name|class],area[shape|coords|href|alt|target|class],bdo[class],button[class],iframe[*],figure,figcaption,video[*],audio[*],picture[*],source[*],canvas[*]',
             },
             { alias: 'invalidElements', value: 'font' },
-            // { alias: 'stylesheets', value: ['/css/rte-content.css'] },
+            { alias: 'stylesheets', value: [] },
             {
                 alias: 'toolbar',
                 value: [
@@ -738,7 +738,6 @@ export const data = [
                     'anchor',
                     'table',
                     'umbmediapicker',
-                    'umbmacro',
                     'umbembeddialog',
                 ],
             },

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

@@ -24,7 +24,18 @@ export const data = [
                 alias: 'richTextEditor',
                 culture: null,
                 segment: null,
-                value: 'Some value for the RTE with an <a href="http://foo.com">external link</a> and an <a href="/{localLink:umb://document/c05da24d7740447b9cdcbd8ce2172e38}">internal link</a> foo foo <div class="umb-macro-holder TestMacro umb-macro-mce_1 mceNonEditable"><!-- <?UMBRACO_MACRO macroAlias="TestMacro" /> --><ins>Macro alias: <strong>TestMacro</strong></ins></div>',
+                value: {
+                    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
+						</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>
+						<div class="mceNonEditable umb-embed-holder" data-embed-height="240" data-embed-width="360" data-embed-constrain="false"><iframe width="360" height="240" src="https://www.youtube.com/embed/QRIWz9SotY4?feature=oembed" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" allowfullscreen="allowfullscreen" title="Sleep Token - The Summoning"></iframe></div>
+						<p>End of test content</p>
+					`,
+                },
             },
             {
                 alias: 'email',

package/dist-cms/mocks/data/health-check.data.js

@@ -9,26 +9,6 @@ export const healthGroups = [
     {
         name: 'Configuration',
         checks: [
-            {
-                id: '1c6c0a39-d673-4794-b734-1bec45d6a363',
-                results: [
-                    {
-                        message: `MacroErrors are set to 'Throw' which will prevent some or all pages in your site from loading
-						completely if there are any errors in macros. Rectifying this will set the value to 'Inline'. `,
-                        resultType: StatusResultTypeModel.ERROR,
-                        readMoreLink: 'https://umbra.co/healthchecks-macro-errors',
-                        actions: [
-                            {
-                                healthCheckId: 'id123',
-                                name: 'Action name',
-                                alias: 'Action alias',
-                                description: 'Action description',
-                                valueRequired: true,
-                            },
-                        ],
-                    },
-                ],
-            },
             {
                 id: '3e2f7b14-4b41-452b-9a30-e67fbc8e1206',
                 results: [
@@ -209,11 +189,6 @@ export const healthGroupsWithoutResult = [
     {
         name: 'Configuration',
         checks: [
-            {
-                id: 'd0f7599e-9b2a-4d9e-9883-81c7edc5616f',
-                name: 'Macro errors',
-                description: 'Checks to make sure macro errors are not set to throw a YSOD (yellow screen of death), which would prevent certain or all pages from loading completely.',
-            },
             {
                 id: '3e2f7b14-4b41-452b-9a30-e67fbc8e1206',
                 name: 'Notification Email Settings',

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

@@ -20,7 +20,7 @@ export const handlers = [
                     },
                     {
                         level: TelemetryLevelModel.DETAILED,
-                        description: 'We will send:<ul><li>Anonymized site ID, umbraco version, and packages installed.</li><li>Number of: Root nodes, Content nodes, Macros, Media, Document Types, Templates, Languages, Domains, User Group, Users, Members, and Property Editors in use.</li><li>System information: Webserver, server OS, server framework, server OS language, and database provider.</li><li>Configuration settings: Modelsbuilder mode, if custom Umbraco path exists, ASP environment, and if you are in debug mode.</li></ul><i>We might change what we send on the Detailed level in the future. If so, it will be listed above.<br>By choosing "Detailed" you agree to current and future anonymized information being collected.</i>',
+                        description: 'We will send:<ul><li>Anonymized site ID, umbraco version, and packages installed.</li><li>Number of: Root nodes, Content nodes, Media, Document Types, Templates, Languages, Domains, User Group, Users, Members, and Property Editors in use.</li><li>System information: Webserver, server OS, server framework, server OS language, and database provider.</li><li>Configuration settings: Modelsbuilder mode, if custom Umbraco path exists, ASP environment, and if you are in debug mode.</li></ul><i>We might change what we send on the Detailed level in the future. If so, it will be listed above.<br>By choosing "Detailed" you agree to current and future anonymized information being collected.</i>',
                     },
                 ],
             },

package/dist-cms/packages/core/components/input-tiny-mce/input-tiny-mce.defaults.js

@@ -1,4 +1,3 @@
-//These are absolutely required in order for the macros to render inline
 //we put these as extended elements because they get merged on top of the normal allowed elements by tiny mce
 //so we don't have to specify all the normal elements again
 export const defaultFallbackConfig = {
@@ -19,7 +18,6 @@ export const defaultFallbackConfig = {
         'indent',
         'link',
         'umbmediapicker',
-        'umbmacro',
         'umbembeddialog',
     ],
     style_formats: [

package/dist-cms/packages/core/components/input-tiny-mce/input-tiny-mce.element.js

@@ -170,6 +170,7 @@ _UmbInputTinyMceElement_setTinyConfig = async function _UmbInputTinyMceElement_s
     const styleFormats = await this.getFormatStyles(stylesheetPaths);
     // Map the stylesheets with server url
     const stylesheets = stylesheetPaths?.map((stylesheetPath) => `${__classPrivateFieldGet(this, _UmbInputTinyMceElement_serverUrl, "f")}/css/${stylesheetPath.replace(/\\/g, '/')}`) ?? [];
+    stylesheets.push('/umbraco/backoffice/css/rte-content.css');
     // create an object by merging the configuration onto the fallback config
     const configurationOptions = {
         ...defaultFallbackConfig,

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

@@ -9,7 +9,6 @@ export * from './entity-action/index.js';
 export * from './entity-bulk-action/index.js';
 export * from './extension-registry/index.js';
 export * from './id/index.js';
-export * from './macro/index.js';
 export * from './menu/index.js';
 export * from './modal/index.js';
 export * from './notification/index.js';

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

@@ -14,7 +14,6 @@ export * from './entity-action/index.js';
 export * from './entity-bulk-action/index.js';
 export * from './extension-registry/index.js';
 export * from './id/index.js';
-export * from './macro/index.js';
 export * from './menu/index.js';
 export * from './modal/index.js';
 export * from './notification/index.js';

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

@@ -64,20 +64,5 @@ const pluginManifests = [
             ],
         },
     },
-    {
-        type: 'tinyMcePlugin',
-        alias: 'Umb.TinyMcePlugin.MacroPicker',
-        name: 'Macro Picker TinyMCE Plugin',
-        js: () => import('./tiny-mce-macropicker.plugin.js'),
-        meta: {
-            toolbar: [
-                {
-                    alias: 'umbmacro',
-                    label: 'Macro',
-                    icon: 'preferences',
-                },
-            ],
-        },
-    },
 ];
 export const manifests = [...pluginManifests];

package/dist-cms/packages/templating/components/insert-menu/templating-insert-menu.element.js

@@ -22,7 +22,7 @@ import { CodeSnippetType } from '../../modals/insert-choose-type-sidebar.element
 import { UmbDictionaryRepository } from '../../../dictionary/dictionary/index.js';
 import { customElement, property, css, html } from '../../../../external/lit/index.js';
 import { UmbTextStyles } from '../../../../shared/style/index.js';
-import { UMB_DICTIONARY_ITEM_PICKER_MODAL, UMB_MODAL_MANAGER_CONTEXT, UMB_PARTIAL_VIEW_PICKER_MODAL, UmbModalToken } from '../../../core/modal/index.js';
+import { UMB_DICTIONARY_ITEM_PICKER_MODAL, UMB_MODAL_MANAGER_CONTEXT, UMB_PARTIAL_VIEW_PICKER_MODAL, UmbModalToken, } from '../../../core/modal/index.js';
 import { UmbLitElement } from '../../../../shared/lit-element/index.js';
 export const UMB_MODAL_TEMPLATING_INSERT_CHOOSE_TYPE_SIDEBAR_MODAL = new UmbModalToken(UMB_MODAL_TEMPLATING_INSERT_CHOOSE_TYPE_SIDEBAR_ALIAS, {
     modal: {
@@ -74,9 +74,6 @@ let UmbTemplatingInsertMenuElement = class UmbTemplatingInsertMenuElement extend
                 __classPrivateFieldGet(this, _UmbTemplatingInsertMenuElement_instances, "m", _UmbTemplatingInsertMenuElement_dispatchInsertEvent).call(this);
                 break;
             }
-            case CodeSnippetType.macro: {
-                throw new Error('Not implemented');
-            }
         }
     }
     render() {
@@ -92,10 +89,6 @@ let UmbTemplatingInsertMenuElement = class UmbTemplatingInsertMenuElement extend
 						title="Dictionary item"
 						@click=${__classPrivateFieldGet(this, _UmbTemplatingInsertMenuElement_instances, "m", _UmbTemplatingInsertMenuElement_openInsertDictionaryItemModal)}>
 					</uui-menu-item>
-
-					<!-- <li>
-							<uui-menu-item class="insert-menu-item" label="Macro" title="Macro"> </uui-menu-item>
-						</li> -->
 				</umb-dropdown>
 			</uui-button-group>
 		`;

package/dist-cms/packages/templating/modals/insert-choose-type-sidebar.element.d.ts

@@ -5,8 +5,7 @@ export interface ChooseInsertTypeModalData {
 }
 export declare enum CodeSnippetType {
     partialView = "partialView",
-    dictionaryItem = "dictionaryItem",
-    macro = "macro"
+    dictionaryItem = "dictionaryItem"
 }
 export interface UmbChooseInsertTypeModalValue {
     value: string | UmbDictionaryItemPickerModalValue;

package/dist-cms/packages/templating/modals/insert-choose-type-sidebar.element.js

@@ -23,7 +23,6 @@ export var CodeSnippetType;
 (function (CodeSnippetType) {
     CodeSnippetType["partialView"] = "partialView";
     CodeSnippetType["dictionaryItem"] = "dictionaryItem";
-    CodeSnippetType["macro"] = "macro";
 })(CodeSnippetType || (CodeSnippetType = {}));
 let UmbChooseInsertTypeModalElement = class UmbChooseInsertTypeModalElement extends UmbModalBaseElement {
     _close() {