Merge pull request #2333 from umbraco/v15/fix/change-password-token

Fix: move change password token

Author: madsrasmussen

package-lock.json

@@ -94,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",

package.json

@@ -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/packages/code-editor/code-editor-modal/code-editor-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/packages/core/icon-registry/icon-picker-modal/icon-picker-modal.stories.ts

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

src/packages/core/modal/token/index.ts

@@ -1,4 +1,3 @@
-import '../../../components/body-layout/body-layout.element.js';
 import './embedded-media-modal.element.js';
 
 import type { UmbEmbeddedMediaModalData } from './embedded-media-modal.token.js';

src/packages/embedded-media/modal/embedded-media-modal.stories.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/packages/user/change-password/change-user-password.action.ts renamed to src/packages/user/change-password/entity-action/change-user-password.action.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/packages/user/change-password/entity-action/manifests.ts

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

src/packages/user/change-password/index.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];