Merge branch 'main' into v15/feature/collection-kind-workspace-view

src/Umbraco.Web.UI.Client/package-lock.json

@@ -7807,6 +7807,10 @@
 			"resolved": "src/packages/documents",
 			"link": true
 		},
+		"node_modules/@umbraco-backoffice/embedded-media": {
+			"resolved": "src/packages/embedded-media",
+			"link": true
+		},
 		"node_modules/@umbraco-backoffice/extension-insights": {
 			"resolved": "src/packages/extension-insights",
 			"link": true
@@ -23083,6 +23087,9 @@
 		"src/packages/documents": {
 			"name": "@umbraco-backoffice/document"
 		},
+		"src/packages/embedded-media": {
+			"name": "@umbraco-backoffice/embedded-media"
+		},
 		"src/packages/extension-insights": {
 			"name": "@umbraco-backoffice/extension-insights"
 		},

src/Umbraco.Web.UI.Client/package.json

@@ -10,6 +10,7 @@
 		"./context-api": "./dist-cms/libs/context-api/index.js",
 		"./controller-api": "./dist-cms/libs/controller-api/index.js",
 		"./element-api": "./dist-cms/libs/element-api/index.js",
+		"./embedded-media": "./dist-cms/packages/embedded-media/index.js",
 		"./extension-api": "./dist-cms/libs/extension-api/index.js",
 		"./formatting-api": "./dist-cms/libs/formatting-api/index.js",
 		"./localization-api": "./dist-cms/libs/localization-api/index.js",
@@ -93,6 +94,7 @@
 		"./tiny-mce": "./dist-cms/packages/tiny-mce/index.js",
 		"./tree": "./dist-cms/packages/core/tree/index.js",
 		"./ufm": "./dist-cms/packages/ufm/index.js",
+		"./user-change-password": "./dist-cms/packages/user/change-password/index.js",
 		"./user-group": "./dist-cms/packages/user/user-group/index.js",
 		"./user-permission": "./dist-cms/packages/user/user-permission/index.js",
 		"./user": "./dist-cms/packages/user/user/index.js",

src/Umbraco.Web.UI.Client/src/apps/backoffice/backoffice.element.ts

@@ -17,6 +17,7 @@ const CORE_PACKAGES = [
 	import('../../packages/data-type/umbraco-package.js'),
 	import('../../packages/dictionary/umbraco-package.js'),
 	import('../../packages/documents/umbraco-package.js'),
+	import('../../packages/embedded-media/umbraco-package.js'),
 	import('../../packages/extension-insights/umbraco-package.js'),
 	import('../../packages/health-check/umbraco-package.js'),
 	import('../../packages/help/umbraco-package.js'),

src/Umbraco.Web.UI.Client/src/packages/code-editor/code-editor-modal/code-editor-modal.stories.ts

@@ -1,5 +1,3 @@
-import '../confirm/confirm-modal.element.js';
-
 import type { UmbCodeEditorModalData } from './code-editor-modal.token.js';
 import type { Meta, Story } from '@storybook/web-components';
 import { html } from '@umbraco-cms/backoffice/external/lit';

src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/icon-picker-modal/icon-picker-modal.stories.ts

@@ -1,4 +1,3 @@
-import '../../../components/body-layout/body-layout.element.js';
 import './icon-picker-modal.element.js';
 
 import type { UmbIconPickerModalElement } from './icon-picker-modal.element.js';

src/Umbraco.Web.UI.Client/src/packages/core/modal/common/embedded-media/manifests.ts

@@ -1,13 +0,0 @@
-import { manifests as repositories } from './repository/manifests.js';
-import type { ManifestModal } from '@umbraco-cms/backoffice/extension-registry';
-
-const modals: Array<ManifestModal> = [
-	{
-		type: 'modal',
-		alias: 'Umb.Modal.EmbeddedMedia',
-		name: 'Embedded Media Modal',
-		element: () => import('./embedded-media-modal.element.js'),
-	},
-];
-
-export const manifests = [...modals, ...repositories];

src/Umbraco.Web.UI.Client/src/packages/core/modal/common/embedded-media/repository/index.ts

@@ -1,2 +0,0 @@
-export { UmbOEmbedRepository } from './oembed.repository.js';
-export { UMB_OEMBED_REPOSITORY_ALIAS } from './manifests.js';

src/Umbraco.Web.UI.Client/src/packages/core/modal/common/index.ts

@@ -1,3 +1,2 @@
-export * from './embedded-media/index.js';
 export * from './confirm/index.js';
 export * from './item-picker/index.js';

src/Umbraco.Web.UI.Client/src/packages/core/modal/common/manifests.ts

@@ -1,13 +1,4 @@
 import { manifests as confirmManifests } from './confirm/manifests.js';
 import { manifests as itemPickerManifests } from './item-picker/manifests.js';
 
-export const manifests: Array<UmbExtensionManifest> = [
-	{
-		type: 'modal',
-		alias: 'Umb.Modal.EmbeddedMedia',
-		name: 'Embedded Media Modal',
-		element: () => import('./embedded-media/embedded-media-modal.element.js'),
-	},
-	...confirmManifests,
-	...itemPickerManifests,
-];
+export const manifests: Array<UmbExtensionManifest> = [...confirmManifests, ...itemPickerManifests];

src/Umbraco.Web.UI.Client/src/packages/core/modal/token/index.ts

@@ -1,3 +1 @@
-export * from './change-password-modal.token.js';
-export * from './embedded-media-modal.token.js';
 export * from './modal-token.js';

src/Umbraco.Web.UI.Client/src/packages/embedded-media/index.ts

@@ -1 +1,2 @@
+export * from './modal/index.js';
 export * from './repository/index.js';

src/Umbraco.Web.UI.Client/src/packages/embedded-media/manifests.ts

@@ -0,0 +1,4 @@
+import { manifests as modalManifests } from './modal/manifests.js';
+import { manifests as repositoryManifests } from './repository/manifests.js';
+
+export const manifests: Array<UmbExtensionManifest> = [...modalManifests, ...repositoryManifests];

src/Umbraco.Web.UI.Client/src/packages/embedded-media/modal/embedded-media-modal.element.ts

@@ -1,7 +1,7 @@
-import { UmbOEmbedRepository } from './repository/oembed.repository.js';
+import { UmbOEmbedRepository } from '../repository/oembed.repository.js';
+import type { UmbEmbeddedMediaModalData, UmbEmbeddedMediaModalValue } from './embedded-media-modal.token.js';
 import { css, html, unsafeHTML, when, customElement, state } from '@umbraco-cms/backoffice/external/lit';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
-import type { UmbEmbeddedMediaModalData, UmbEmbeddedMediaModalValue } from '@umbraco-cms/backoffice/modal';
 import { UmbModalBaseElement } from '@umbraco-cms/backoffice/modal';
 import type { UUIButtonState, UUIInputEvent } from '@umbraco-cms/backoffice/external/uui';
 

src/Umbraco.Web.UI.Client/src/packages/embedded-media/modal/embedded-media-modal.stories.ts

@@ -1,9 +1,8 @@
-import '../../../components/body-layout/body-layout.element.js';
 import './embedded-media-modal.element.js';
 
+import type { UmbEmbeddedMediaModalData } from './embedded-media-modal.token.js';
 import type { Meta } from '@storybook/web-components';
 import { html } from '@umbraco-cms/backoffice/external/lit';
-import type { UmbEmbeddedMediaModalData } from '@umbraco-cms/backoffice/modal';
 
 export default {
 	title: 'API/Modals/Layouts/Embedded Media',

src/Umbraco.Web.UI.Client/src/packages/embedded-media/modal/embedded-media-modal.token.ts

@@ -1,4 +1,4 @@
-import { UmbModalToken } from './modal-token.js';
+import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
 
 export interface UmbEmbeddedMediaModalData extends Partial<UmbEmbeddedMediaDimensionsModel> {
 	url?: string;

src/Umbraco.Web.UI.Client/src/packages/embedded-media/modal/index.ts

@@ -0,0 +1 @@
+export * from './embedded-media-modal.token.js';

src/Umbraco.Web.UI.Client/src/packages/embedded-media/modal/manifests.ts

@@ -0,0 +1,8 @@
+export const manifests: Array<UmbExtensionManifest> = [
+	{
+		type: 'modal',
+		alias: 'Umb.Modal.EmbeddedMedia',
+		name: 'Embedded Media Modal',
+		element: () => import('./embedded-media-modal.element.js'),
+	},
+];

src/Umbraco.Web.UI.Client/src/packages/embedded-media/package.json

@@ -0,0 +1,8 @@
+{
+	"name": "@umbraco-backoffice/embedded-media",
+	"private": true,
+	"type": "module",
+	"scripts": {
+		"build": "vite build"
+	}
+}

src/Umbraco.Web.UI.Client/src/packages/embedded-media/repository/constants.ts

@@ -0,0 +1 @@
+export const UMB_OEMBED_REPOSITORY_ALIAS = 'Umb.Repository.OEmbed';

src/Umbraco.Web.UI.Client/src/packages/embedded-media/repository/index.ts

@@ -0,0 +1,2 @@
+export * from './oembed.repository.js';
+export * from './constants.js';

src/Umbraco.Web.UI.Client/src/packages/embedded-media/repository/manifests.ts

@@ -1,4 +1,4 @@
-export const UMB_OEMBED_REPOSITORY_ALIAS = 'Umb.Repository.OEmbed';
+import { UMB_OEMBED_REPOSITORY_ALIAS } from './constants.js';
 
 export const manifests: Array<UmbExtensionManifest> = [
 	{

src/Umbraco.Web.UI.Client/src/packages/embedded-media/umbraco-package.ts

@@ -0,0 +1,9 @@
+export const name = 'Umbraco.Core.EmbeddedMedia';
+export const extensions = [
+	{
+		name: 'Embedded Media Bundle',
+		alias: 'Umb.Bundle.EmbeddedMedia',
+		type: 'bundle',
+		js: () => import('./manifests.js'),
+	},
+];

src/Umbraco.Web.UI.Client/src/packages/embedded-media/vite.config.ts

@@ -0,0 +1,12 @@
+import { defineConfig } from 'vite';
+import { rmSync } from 'fs';
+import { getDefaultConfig } from '../../vite-config-base';
+
+const dist = '../../../dist-cms/packages/embedded-media';
+
+// delete the unbundled dist folder
+rmSync(dist, { recursive: true, force: true });
+
+export default defineConfig({
+	...getDefaultConfig({ dist }),
+});

src/Umbraco.Web.UI.Client/src/packages/tiny-mce/plugins/tiny-mce-embeddedmedia.plugin.ts

@@ -1,7 +1,8 @@
 import { type TinyMcePluginArguments, UmbTinyMcePluginBase } from '../components/input-tiny-mce/tiny-mce-plugin.js';
 import { UmbLocalizationController } from '@umbraco-cms/backoffice/localization-api';
-import type { UmbEmbeddedMediaModalData, UmbEmbeddedMediaModalValue } from '@umbraco-cms/backoffice/modal';
-import { UMB_EMBEDDED_MEDIA_MODAL, UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';
+import type { UmbEmbeddedMediaModalData, UmbEmbeddedMediaModalValue } from '@umbraco-cms/backoffice/embedded-media';
+import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';
+import { UMB_EMBEDDED_MEDIA_MODAL } from '@umbraco-cms/backoffice/embedded-media';
 
 export default class UmbTinyMceEmbeddedMediaPlugin extends UmbTinyMcePluginBase {
 	constructor(args: TinyMcePluginArguments) {

src/Umbraco.Web.UI.Client/src/packages/user/change-password/entity-action/change-user-password.action.ts

@@ -1,8 +1,9 @@
+import { UMB_CHANGE_PASSWORD_MODAL } from '../modal/index.js';
 import { UmbChangeUserPasswordRepository } from '@umbraco-cms/backoffice/user';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import type { UmbEntityActionArgs } from '@umbraco-cms/backoffice/entity-action';
 import { UmbEntityActionBase } from '@umbraco-cms/backoffice/entity-action';
-import { UMB_MODAL_MANAGER_CONTEXT, UMB_CHANGE_PASSWORD_MODAL } from '@umbraco-cms/backoffice/modal';
+import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';
 import { UMB_CURRENT_USER_CONTEXT, UmbCurrentUserRepository } from '@umbraco-cms/backoffice/current-user';
 
 export class UmbChangeUserPasswordEntityAction extends UmbEntityActionBase<never> {

src/Umbraco.Web.UI.Client/src/packages/user/change-password/entity-action/manifests.ts

@@ -0,0 +1,22 @@
+import { UMB_USER_ENTITY_TYPE } from '@umbraco-cms/backoffice/user';
+
+export const manifests: Array<UmbExtensionManifest> = [
+	{
+		type: 'entityAction',
+		kind: 'default',
+		alias: 'Umb.EntityAction.User.ChangePassword',
+		name: 'Change User Password Entity Action',
+		weight: 600,
+		api: () => import('./change-user-password.action.js'),
+		forEntityTypes: [UMB_USER_ENTITY_TYPE],
+		meta: {
+			icon: 'icon-key',
+			label: '#user_changePassword',
+		},
+		conditions: [
+			{
+				alias: 'Umb.Condition.User.AllowChangePassword',
+			},
+		],
+	},
+];

src/Umbraco.Web.UI.Client/src/packages/user/change-password/index.ts

@@ -0,0 +1 @@
+export * from './modal/index.js';

src/Umbraco.Web.UI.Client/src/packages/user/change-password/manifests.ts

@@ -1,28 +1,4 @@
-import { UMB_USER_ENTITY_TYPE } from '@umbraco-cms/backoffice/user';
+import { manifests as entityActionManifests } from './entity-action/manifests.js';
+import { manifests as modalManifests } from './modal/manifests.js';
 
-export const manifests: Array<UmbExtensionManifest> = [
-	{
-		type: 'entityAction',
-		kind: 'default',
-		alias: 'Umb.EntityAction.User.ChangePassword',
-		name: 'Change User Password Entity Action',
-		weight: 600,
-		api: () => import('./change-user-password.action.js'),
-		forEntityTypes: [UMB_USER_ENTITY_TYPE],
-		meta: {
-			icon: 'icon-key',
-			label: '#user_changePassword',
-		},
-		conditions: [
-			{
-				alias: 'Umb.Condition.User.AllowChangePassword',
-			},
-		],
-	},
-	{
-		type: 'modal',
-		alias: 'Umb.Modal.ChangePassword',
-		name: 'Change Password Modal',
-		js: () => import('./change-password-modal.element.js'),
-	},
-];
+export const manifests: Array<UmbExtensionManifest> = [...entityActionManifests, ...modalManifests];

src/Umbraco.Web.UI.Client/src/packages/user/change-password/modal/change-password-modal.element.ts

@@ -1,9 +1,9 @@
+import type { UmbChangePasswordModalData, UmbChangePasswordModalValue } from './change-password-modal.token.js';
 import { UMB_CURRENT_USER_CONTEXT } from '@umbraco-cms/backoffice/current-user';
 import { UmbUserItemRepository } from '@umbraco-cms/backoffice/user';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import type { CSSResultGroup } from '@umbraco-cms/backoffice/external/lit';
 import { css, html, nothing, customElement, state } from '@umbraco-cms/backoffice/external/lit';
-import type { UmbChangePasswordModalData, UmbChangePasswordModalValue } from '@umbraco-cms/backoffice/modal';
 import { UmbModalBaseElement } from '@umbraco-cms/backoffice/modal';
 
 @customElement('umb-change-password-modal')

src/Umbraco.Web.UI.Client/src/packages/user/change-password/modal/change-password-modal.token.ts

@@ -1,4 +1,4 @@
-import { UmbModalToken } from './modal-token.js';
+import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
 
 export interface UmbChangePasswordModalData {
 	user: {

src/Umbraco.Web.UI.Client/src/packages/user/change-password/modal/index.ts

@@ -0,0 +1 @@
+export * from './change-password-modal.token.js';

src/Umbraco.Web.UI.Client/src/packages/user/change-password/modal/manifests.ts

@@ -0,0 +1,8 @@
+export const manifests: Array<UmbExtensionManifest> = [
+	{
+		type: 'modal',
+		alias: 'Umb.Modal.ChangePassword',
+		name: 'Change Password Modal',
+		js: () => import('./change-password-modal.element.js'),
+	},
+];

src/Umbraco.Web.UI.Client/src/packages/user/current-user/profile/change-password-current-user.action.ts

@@ -3,7 +3,8 @@ import { UmbCurrentUserRepository } from '../repository/index.js';
 import { UmbActionBase } from '@umbraco-cms/backoffice/action';
 import type { UmbCurrentUserAction, UmbCurrentUserActionArgs } from '@umbraco-cms/backoffice/extension-registry';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
-import { UMB_CHANGE_PASSWORD_MODAL, UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';
+import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';
+import { UMB_CHANGE_PASSWORD_MODAL } from '@umbraco-cms/backoffice/user-change-password';
 export class UmbChangePasswordCurrentUserAction<ArgsMetaType = never>
 	extends UmbActionBase<UmbCurrentUserActionArgs<ArgsMetaType>>
 	implements UmbCurrentUserAction<ArgsMetaType>

src/Umbraco.Web.UI.Client/src/packages/user/vite.config.ts

@@ -11,12 +11,13 @@ export default defineConfig({
 	...getDefaultConfig({
 		dist,
 		entry: {
+			'current-user/index': 'current-user/index.ts',
+			'umbraco-package': 'umbraco-package.ts',
+			'change-password/index': 'change-password/index.ts',
 			'user-group/index': 'user-group/index.ts',
 			'user-permission/index': 'user-permission/index.ts',
 			'user/index': 'user/index.ts',
-			'current-user/index': 'current-user/index.ts',
 			manifests: 'manifests.ts',
-			'umbraco-package': 'umbraco-package.ts',
 		},
 	}),
 });

src/Umbraco.Web.UI.Client/tsconfig.json

@@ -38,6 +38,7 @@ DON'T EDIT THIS FILE DIRECTLY. It is generated by /devops/tsconfig/index.js
 			"@umbraco-cms/backoffice/context-api": ["./src/libs/context-api/index.ts"],
 			"@umbraco-cms/backoffice/controller-api": ["./src/libs/controller-api/index.ts"],
 			"@umbraco-cms/backoffice/element-api": ["./src/libs/element-api/index.ts"],
+			"@umbraco-cms/backoffice/embedded-media": ["./src/packages/embedded-media/index.ts"],
 			"@umbraco-cms/backoffice/extension-api": ["./src/libs/extension-api/index.ts"],
 			"@umbraco-cms/backoffice/formatting-api": ["./src/libs/formatting-api/index.ts"],
 			"@umbraco-cms/backoffice/localization-api": ["./src/libs/localization-api/index.ts"],
@@ -121,6 +122,7 @@ DON'T EDIT THIS FILE DIRECTLY. It is generated by /devops/tsconfig/index.js
 			"@umbraco-cms/backoffice/tiny-mce": ["./src/packages/tiny-mce/index.ts"],
 			"@umbraco-cms/backoffice/tree": ["./src/packages/core/tree/index.ts"],
 			"@umbraco-cms/backoffice/ufm": ["./src/packages/ufm/index.ts"],
+			"@umbraco-cms/backoffice/user-change-password": ["./src/packages/user/change-password/index.ts"],
 			"@umbraco-cms/backoffice/user-group": ["./src/packages/user/user-group/index.ts"],
 			"@umbraco-cms/backoffice/user-permission": ["./src/packages/user/user-permission/index.ts"],
 			"@umbraco-cms/backoffice/user": ["./src/packages/user/user/index.ts"],