Merge pull request #2373 from umbraco/v15/feature/emm-user-profile-app

Extension Manifest Map: User Profile App + Current User Action

src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/index.ts

@@ -1,30 +1,24 @@
 import type { ManifestAuthProvider } from './auth-provider.model.js';
-import type { ManifestCurrentUserAction, ManifestCurrentUserActionDefaultKind } from './current-user-action.model.js';
 import type { ManifestDynamicRootOrigin, ManifestDynamicRootQueryStep } from './dynamic-root.model.js';
 import type { ManifestFileUploadPreview } from './file-upload-preview.model.js';
 import type { ManifestExternalLoginProvider } from './external-login-provider.model.js';
 import type { ManifestUfmComponent } from './ufm-component.model.js';
 import type { ManifestUfmFilter } from './ufm-filter.model.js';
-import type { ManifestUserProfileApp } from './user-profile-app.model.js';
 import type { ManifestMfaLoginProvider } from './mfa-login-provider.model.js';
 import type { ManifestBase, ManifestBundle, ManifestCondition } from '@umbraco-cms/backoffice/extension-api';
 
 export type * from './auth-provider.model.js';
-export type * from './current-user-action.model.js';
 export type * from './dynamic-root.model.js';
 export type * from './file-upload-preview.model.js';
 export type * from './external-login-provider.model.js';
 export type * from './mfa-login-provider.model.js';
 export type * from './ufm-component.model.js';
 export type * from './ufm-filter.model.js';
-export type * from './user-profile-app.model.js';
 
 export type ManifestTypes =
 	| ManifestAuthProvider
 	| ManifestBundle<ManifestTypes>
 	| ManifestCondition
-	| ManifestCurrentUserAction
-	| ManifestCurrentUserActionDefaultKind
 	| ManifestDynamicRootOrigin
 	| ManifestDynamicRootQueryStep
 	| ManifestFileUploadPreview
@@ -32,7 +26,6 @@ export type ManifestTypes =
 	| ManifestMfaLoginProvider
 	| ManifestUfmComponent
 	| ManifestUfmFilter
-	| ManifestUserProfileApp
 	| ManifestBase;
 
 type UnionOfProperties<T> = T extends object ? T[keyof T] : never;

src/Umbraco.Web.UI.Client/src/packages/user/current-user/action/current-user-app-button.element.ts

@@ -1,11 +1,11 @@
-import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
-import { html, customElement, ifDefined, state, property } from '@umbraco-cms/backoffice/external/lit';
-import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import type {
 	ManifestCurrentUserActionDefaultKind,
 	MetaCurrentUserActionDefaultKind,
 	UmbCurrentUserAction,
-} from '@umbraco-cms/backoffice/extension-registry';
+} from '../current-user-action.extension.js';
+import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
+import { html, customElement, ifDefined, state, property } from '@umbraco-cms/backoffice/external/lit';
+import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { UmbActionExecutedEvent } from '@umbraco-cms/backoffice/event';
 
 @customElement('umb-current-user-app-button')

src/Umbraco.Web.UI.Client/src/packages/user/current-user/current-user-action.extension.ts

@@ -1,4 +1,4 @@
-import type { UmbAction } from '../../action/action.interface.js';
+import type { UmbAction } from '@umbraco-cms/backoffice/action';
 import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
 import type { ManifestElementAndApi, ManifestWithDynamicConditions } from '@umbraco-cms/backoffice/extension-api';
 import type { UUIInterfaceColor, UUIInterfaceLook } from '@umbraco-cms/backoffice/external/uui';
@@ -69,3 +69,9 @@ export interface MetaCurrentUserActionDefaultKind extends MetaCurrentUserAction
 	 */
 	color?: UUIInterfaceColor;
 }
+
+declare global {
+	interface UmbExtensionManifestMap {
+		umbCurrentUserAction: ManifestCurrentUserAction;
+	}
+}

src/Umbraco.Web.UI.Client/src/packages/user/current-user/external-login/configure-external-login-providers-action.ts

@@ -1,6 +1,6 @@
+import type { UmbCurrentUserAction, UmbCurrentUserActionArgs } from '../current-user-action.extension.js';
 import { UMB_CURRENT_USER_EXTERNAL_LOGIN_MODAL } from './modals/external-login-modal.token.js';
 import { UmbActionBase } from '@umbraco-cms/backoffice/action';
-import type { UmbCurrentUserAction, UmbCurrentUserActionArgs } from '@umbraco-cms/backoffice/extension-registry';
 import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';
 
 export class UmbConfigureExternalLoginProvidersApi<ArgsMetaType = never>

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

@@ -6,5 +6,7 @@ export * from './current-user.context.token.js';
 export * from './history/current-user-history.store.js';
 export * from './repository/index.js';
 export * from './utils/index.js';
+export * from './user-profile-app.extension.js';
+export * from './current-user-action.extension.js';
 
 export type * from './types.js';

src/Umbraco.Web.UI.Client/src/packages/user/current-user/mfa-login/configure-mfa-providers-action.ts

@@ -1,6 +1,6 @@
 import { UMB_CURRENT_USER_MFA_MODAL } from '../modals/current-user-mfa/current-user-mfa-modal.token.js';
+import type { UmbCurrentUserAction, UmbCurrentUserActionArgs } from '../current-user-action.extension.js';
 import { UmbActionBase } from '@umbraco-cms/backoffice/action';
-import type { UmbCurrentUserAction, UmbCurrentUserActionArgs } from '@umbraco-cms/backoffice/extension-registry';
 import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';
 
 export class UmbConfigureMfaProvidersApi<ArgsMetaType = never>

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

@@ -1,7 +1,7 @@
 import { UMB_CURRENT_USER_CONTEXT } from '../current-user.context.token.js';
 import { UmbCurrentUserRepository } from '../repository/index.js';
+import type { UmbCurrentUserAction, UmbCurrentUserActionArgs } from '../current-user-action.extension.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_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';
 import { UMB_CHANGE_PASSWORD_MODAL } from '@umbraco-cms/backoffice/user-change-password';

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

@@ -1,7 +1,7 @@
 import { UMB_CURRENT_USER_CONTEXT } from '../current-user.context.token.js';
+import type { UmbCurrentUserAction, UmbCurrentUserActionArgs } from '../current-user-action.extension.js';
 import { UMB_USER_WORKSPACE_PATH } from '@umbraco-cms/backoffice/user';
 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';
 
 export class UmbEditCurrentUserAction<ArgsMetaType = never>

src/Umbraco.Web.UI.Client/src/packages/user/current-user/user-profile-app.extension.ts

@@ -9,3 +9,9 @@ export interface MetaUserProfileApp {
 	label: string;
 	pathname: string;
 }
+
+declare global {
+	interface UmbExtensionManifestMap {
+		umbUserProfileApp: ManifestUserProfileApp;
+	}
+}