Merge branch 'v15/dev' into v15/feature/enable-document-rollback-as-entity-action

Author: madsrasmussen

src/Umbraco.Cms.Api.Management/OpenApi.json

@@ -35978,14 +35978,11 @@
           "mediaStartNodeIds",
           "name",
           "permissions",
+          "userGroupIds",
           "userName"
         ],
         "type": "object",
         "properties": {
-          "id": {
-            "type": "string",
-            "format": "uuid"
-          },
           "email": {
             "type": "string"
           },
@@ -35995,6 +35992,21 @@
           "name": {
             "type": "string"
           },
+          "userGroupIds": {
+            "uniqueItems": true,
+            "type": "array",
+            "items": {
+              "oneOf": [
+                {
+                  "$ref": "#/components/schemas/ReferenceByIdModel"
+                }
+              ]
+            }
+          },
+          "id": {
+            "type": "string",
+            "format": "uuid"
+          },
           "languageIsoCode": {
             "type": "string",
             "nullable": true
@@ -37794,6 +37806,16 @@
             "type": "string",
             "format": "date-time",
             "nullable": true
+          },
+          "scheduledPublishDate": {
+            "type": "string",
+            "format": "date-time",
+            "nullable": true
+          },
+          "scheduledUnpublishDate": {
+            "type": "string",
+            "format": "date-time",
+            "nullable": true
           }
         },
         "additionalProperties": false

src/Umbraco.Core/Routing/NewDefaultUrlProvider.cs

@@ -117,7 +117,7 @@ public virtual IEnumerable<UrlInfo> GetOtherUrls(int id, Uri current)
 
             // although we are passing in culture here, if any node in this path is invariant, it ignores the culture anyways so this is ok
             var route = GetLegacyRouteFormatById(key, culture);
-            if (route == null)
+            if (route == null || route == "#")
             {
                 continue;
             }

src/Umbraco.Web.UI.Client/src/external/tiptap/extensions/tiptap-div.extension.ts

@@ -0,0 +1,32 @@
+import { Node, mergeAttributes } from '@tiptap/core';
+
+export interface DivOptions {
+	/**
+	 * HTML attributes to add to the element.
+	 * @default {}
+	 * @example { class: 'foo' }
+	 */
+	HTMLAttributes: Record<string, any>;
+}
+
+export const Div = Node.create<DivOptions>({
+	name: 'div',
+
+	priority: 50,
+
+	group: 'block',
+
+	content: 'inline*',
+
+	addOptions() {
+		return { HTMLAttributes: {} };
+	},
+
+	parseHTML() {
+		return [{ tag: 'div' }];
+	},
+
+	renderHTML({ HTMLAttributes }) {
+		return ['div', mergeAttributes(this.options.HTMLAttributes, HTMLAttributes), 0];
+	},
+});

src/Umbraco.Web.UI.Client/src/external/tiptap/extensions/tiptap-html-global-attributes.extension.ts

@@ -0,0 +1,52 @@
+import { Extension } from '@tiptap/core';
+
+/**
+ * Converts camelCase to kebab-case.
+ * @param {string} str - The string to convert.
+ * @returns {string} The converted string.
+ */
+function camelCaseToKebabCase(str: string): string {
+	return str.replace(/[A-Z]+(?![a-z])|[A-Z]/g, ($, ofs) => (ofs ? '-' : '') + $.toLowerCase());
+}
+
+export interface HtmlGlobalAttributesOptions {
+	/**
+	 * The types where the text align attribute can be applied.
+	 * @default []
+	 * @example ['heading', 'paragraph']
+	 */
+	types: Array<string>;
+}
+
+export const HtmlGlobalAttributes = Extension.create<HtmlGlobalAttributesOptions>({
+	name: 'htmlGlobalAttributes',
+
+	addOptions() {
+		return { types: [] };
+	},
+
+	addGlobalAttributes() {
+		return [
+			{
+				types: this.options.types,
+				attributes: {
+					class: {},
+					dataset: {
+						parseHTML: (element) => element.dataset,
+						renderHTML: (attributes) => {
+							const keys = attributes.dataset ? Object.keys(attributes.dataset) : [];
+							if (!keys.length) return {};
+							const dataAtrrs: Record<string, string> = {};
+							keys.forEach((key) => {
+								dataAtrrs['data-' + camelCaseToKebabCase(key)] = attributes.dataset[key];
+							});
+							return dataAtrrs;
+						},
+					},
+					id: {},
+					style: {},
+				},
+			},
+		];
+	},
+});

src/Umbraco.Web.UI.Client/src/external/tiptap/extensions/tiptap-span.extension.ts

@@ -0,0 +1,32 @@
+import { Node, mergeAttributes } from '@tiptap/core';
+
+export interface SpanOptions {
+	/**
+	 * HTML attributes to add to the element.
+	 * @default {}
+	 * @example { class: 'foo' }
+	 */
+	HTMLAttributes: Record<string, any>;
+}
+
+export const Span = Node.create<SpanOptions>({
+	name: 'span',
+
+	group: 'inline',
+
+	inline: true,
+
+	content: 'inline*',
+
+	addOptions() {
+		return { HTMLAttributes: {} };
+	},
+
+	parseHTML() {
+		return [{ tag: 'span' }];
+	},
+
+	renderHTML({ HTMLAttributes }) {
+		return ['span', mergeAttributes(this.options.HTMLAttributes, HTMLAttributes), 0];
+	},
+});

src/Umbraco.Web.UI.Client/src/external/tiptap/extensions/tiptap-umb-embedded-media.extension.ts

@@ -8,6 +8,7 @@ export const umbEmbeddedMedia = Node.create({
 	inline() {
 		return this.options.inline;
 	},
+
 	atom: true,
 	marks: '',
 	draggable: true,
@@ -19,12 +20,18 @@ export const umbEmbeddedMedia = Node.create({
 			'data-embed-height': { default: 240 },
 			'data-embed-url': { default: null },
 			'data-embed-width': { default: 360 },
-			markup: { default: null },
+			markup: { default: null, parseHTML: (element) => element.innerHTML },
 		};
 	},
 
 	parseHTML() {
-		return [{ tag: 'div', class: 'umb-embed-holder', getAttrs: (node) => ({ markup: node.innerHTML }) }];
+		return [
+			{
+				tag: 'div',
+				priority: 100,
+				getAttrs: (dom) => dom.classList.contains('umb-embed-holder') && null,
+			},
+		];
 	},
 
 	renderHTML({ HTMLAttributes }) {

src/Umbraco.Web.UI.Client/src/external/tiptap/index.ts

@@ -28,8 +28,11 @@ export { TextAlign } from '@tiptap/extension-text-align';
 export { Underline } from '@tiptap/extension-underline';
 
 // CUSTOM EXTENSIONS
-export * from './extensions/tiptap-umb-embedded-media.extension.js';
+export * from './extensions/tiptap-div.extension.js';
 export * from './extensions/tiptap-figcaption.extension.js';
 export * from './extensions/tiptap-figure.extension.js';
+export * from './extensions/tiptap-span.extension.js';
+export * from './extensions/tiptap-html-global-attributes.extension.js';
+export * from './extensions/tiptap-umb-embedded-media.extension.js';
 export * from './extensions/tiptap-umb-image.extension.js';
 export * from './extensions/tiptap-umb-link.extension.js';

src/Umbraco.Web.UI.Client/src/mocks/data/media-type/media-type.data.ts

@@ -8,6 +8,11 @@ export type UmbMockMediaTypeModel = MediaTypeResponseModel &
 	MediaTypeTreeItemResponseModel &
 	MediaTypeItemResponseModel;
 
+export type UmbMockMediaTypeUnionModel =
+	| MediaTypeResponseModel
+	| MediaTypeTreeItemResponseModel
+	| MediaTypeItemResponseModel;
+
 export const data: Array<UmbMockMediaTypeModel> = [
 	{
 		name: 'Media Type 1',

src/Umbraco.Web.UI.Client/src/mocks/data/media-type/media-type.db.ts

@@ -3,19 +3,21 @@ import { UmbMockEntityFolderManager } from '../utils/entity/entity-folder.manage
 import { UmbMockEntityTreeManager } from '../utils/entity/entity-tree.manager.js';
 import { UmbMockEntityItemManager } from '../utils/entity/entity-item.manager.js';
 import { UmbMockEntityDetailManager } from '../utils/entity/entity-detail.manager.js';
-import type { UmbMockMediaTypeModel } from './media-type.data.js';
+import type { UmbMockMediaTypeModel, UmbMockMediaTypeUnionModel } from './media-type.data.js';
 import { data } from './media-type.data.js';
 import { UmbId } from '@umbraco-cms/backoffice/id';
 import type {
 	AllowedMediaTypeModel,
 	CreateFolderRequestModel,
 	CreateMediaTypeRequestModel,
+	GetItemMediaTypeAllowedResponse,
 	MediaTypeItemResponseModel,
 	MediaTypeResponseModel,
 	MediaTypeSortModel,
 	MediaTypeTreeItemResponseModel,
 	PagedAllowedMediaTypeModel,
 } from '@umbraco-cms/backoffice/external/backend-api';
+import { umbDataTypeMockDb } from '../data-type/data-type.db.js';
 
 class UmbMediaTypeMockDB extends UmbEntityMockDbBase<UmbMockMediaTypeModel> {
 	tree = new UmbMockEntityTreeManager<UmbMockMediaTypeModel>(this, mediaTypeTreeItemMapper);
@@ -45,6 +47,26 @@ class UmbMediaTypeMockDB extends UmbEntityMockDbBase<UmbMockMediaTypeModel> {
 		const mappedItems = mockItems.map((item) => allowedMediaTypeMapper(item));
 		return { items: mappedItems, total: mappedItems.length };
 	}
+
+	getAllowedByFileExtension(fileExtension: string): GetItemMediaTypeAllowedResponse {
+		const allowedTypes = this.data.filter((field) => {
+			const allProperties = field.properties.flat();
+
+			const fileUploadType = allProperties.find((prop) => prop.alias === 'umbracoFile');
+			if (!fileUploadType) return false;
+
+			const dataType = umbDataTypeMockDb.read(fileUploadType.dataType.id);
+			if (dataType?.editorAlias !== 'Umbraco.UploadField') return false;
+
+			const allowedFileExtensions = dataType.values.find((value) => value.alias === 'fileExtensions')?.value;
+			if (!allowedFileExtensions || !Array.isArray(allowedFileExtensions)) return false;
+
+			return allowedFileExtensions.includes(fileExtension);
+		});
+
+		const mappedTypes = allowedTypes.map(mediaTypeItemMapper);
+		return allowedExtensionMediaTypeMapper(mappedTypes, mappedTypes.length);
+	}
 }
 
 const createMockMediaTypeFolderMapper = (request: CreateFolderRequestModel): UmbMockMediaTypeModel => {
@@ -128,7 +150,7 @@ const mediaTypeTreeItemMapper = (item: UmbMockMediaTypeModel): MediaTypeTreeItem
 	};
 };
 
-const mediaTypeItemMapper = (item: UmbMockMediaTypeModel): MediaTypeItemResponseModel => {
+const mediaTypeItemMapper = (item: UmbMockMediaTypeUnionModel): MediaTypeItemResponseModel => {
 	return {
 		id: item.id,
 		name: item.name,
@@ -145,4 +167,14 @@ const allowedMediaTypeMapper = (item: UmbMockMediaTypeModel): AllowedMediaTypeMo
 	};
 };
 
+const allowedExtensionMediaTypeMapper = (
+	items: Array<MediaTypeItemResponseModel>,
+	total: number,
+): GetItemMediaTypeAllowedResponse => {
+	return {
+		items,
+		total,
+	};
+};
+
 export const umbMediaTypeMockDb = new UmbMediaTypeMockDB(data);

src/Umbraco.Web.UI.Client/src/mocks/handlers/media-type/item.handlers.ts

@@ -10,4 +10,13 @@ export const itemHandlers = [
 		const items = umbMediaTypeMockDb.item.getItems(ids);
 		return res(ctx.status(200), ctx.json(items));
 	}),
+
+	rest.get(umbracoPath(`/item${UMB_SLUG}/allowed`), (req, res, ctx) => {
+		const fileExtension = req.url.searchParams.get('fileExtension');
+		if (!fileExtension) return;
+
+		const response = umbMediaTypeMockDb.getAllowedByFileExtension(fileExtension);
+
+		return res(ctx.status(200), ctx.json(response));
+	}),
 ];