Skip to content

Commit 71aa60e

Browse files
authored
Merge pull request #2373 from umbraco/v15/feature/emm-user-profile-app
Extension Manifest Map: User Profile App + Current User Action
2 parents 6cb8467 + eea7335 commit 71aa60e

File tree

9 files changed

+23
-16
lines changed

9 files changed

+23
-16
lines changed

src/packages/core/extension-registry/models/index.ts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,31 @@
11
import type { ManifestAuthProvider } from './auth-provider.model.js';
2-
import type { ManifestCurrentUserAction, ManifestCurrentUserActionDefaultKind } from './current-user-action.model.js';
32
import type { ManifestDynamicRootOrigin, ManifestDynamicRootQueryStep } from './dynamic-root.model.js';
43
import type { ManifestFileUploadPreview } from './file-upload-preview.model.js';
54
import type { ManifestExternalLoginProvider } from './external-login-provider.model.js';
65
import type { ManifestUfmComponent } from './ufm-component.model.js';
76
import type { ManifestUfmFilter } from './ufm-filter.model.js';
8-
import type { ManifestUserProfileApp } from './user-profile-app.model.js';
97
import type { ManifestMfaLoginProvider } from './mfa-login-provider.model.js';
108
import type { ManifestBase, ManifestBundle, ManifestCondition } from '@umbraco-cms/backoffice/extension-api';
119

1210
export type * from './auth-provider.model.js';
13-
export type * from './current-user-action.model.js';
1411
export type * from './dynamic-root.model.js';
1512
export type * from './file-upload-preview.model.js';
1613
export type * from './external-login-provider.model.js';
1714
export type * from './mfa-login-provider.model.js';
1815
export type * from './ufm-component.model.js';
1916
export type * from './ufm-filter.model.js';
20-
export type * from './user-profile-app.model.js';
2117

2218
export type ManifestTypes =
2319
| ManifestAuthProvider
2420
| ManifestBundle<ManifestTypes>
2521
| ManifestCondition
26-
| ManifestCurrentUserAction
27-
| ManifestCurrentUserActionDefaultKind
2822
| ManifestDynamicRootOrigin
2923
| ManifestDynamicRootQueryStep
3024
| ManifestFileUploadPreview
3125
| ManifestExternalLoginProvider
3226
| ManifestMfaLoginProvider
3327
| ManifestUfmComponent
3428
| ManifestUfmFilter
35-
| ManifestUserProfileApp
3629
| ManifestBase;
3730

3831
type UnionOfProperties<T> = T extends object ? T[keyof T] : never;

src/packages/user/current-user/action/current-user-app-button.element.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
2-
import { html, customElement, ifDefined, state, property } from '@umbraco-cms/backoffice/external/lit';
3-
import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
41
import type {
52
ManifestCurrentUserActionDefaultKind,
63
MetaCurrentUserActionDefaultKind,
74
UmbCurrentUserAction,
8-
} from '@umbraco-cms/backoffice/extension-registry';
5+
} from '../current-user-action.extension.js';
6+
import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
7+
import { html, customElement, ifDefined, state, property } from '@umbraco-cms/backoffice/external/lit';
8+
import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
99
import { UmbActionExecutedEvent } from '@umbraco-cms/backoffice/event';
1010

1111
@customElement('umb-current-user-app-button')

src/packages/core/extension-registry/models/current-user-action.model.ts renamed to src/packages/user/current-user/current-user-action.extension.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { UmbAction } from '../../action/action.interface.js';
1+
import type { UmbAction } from '@umbraco-cms/backoffice/action';
22
import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
33
import type { ManifestElementAndApi, ManifestWithDynamicConditions } from '@umbraco-cms/backoffice/extension-api';
44
import type { UUIInterfaceColor, UUIInterfaceLook } from '@umbraco-cms/backoffice/external/uui';
@@ -69,3 +69,9 @@ export interface MetaCurrentUserActionDefaultKind extends MetaCurrentUserAction
6969
*/
7070
color?: UUIInterfaceColor;
7171
}
72+
73+
declare global {
74+
interface UmbExtensionManifestMap {
75+
umbCurrentUserAction: ManifestCurrentUserAction;
76+
}
77+
}

src/packages/user/current-user/external-login/configure-external-login-providers-action.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
import type { UmbCurrentUserAction, UmbCurrentUserActionArgs } from '../current-user-action.extension.js';
12
import { UMB_CURRENT_USER_EXTERNAL_LOGIN_MODAL } from './modals/external-login-modal.token.js';
23
import { UmbActionBase } from '@umbraco-cms/backoffice/action';
3-
import type { UmbCurrentUserAction, UmbCurrentUserActionArgs } from '@umbraco-cms/backoffice/extension-registry';
44
import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';
55

66
export class UmbConfigureExternalLoginProvidersApi<ArgsMetaType = never>

src/packages/user/current-user/index.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,7 @@ export * from './current-user.context.token.js';
66
export * from './history/current-user-history.store.js';
77
export * from './repository/index.js';
88
export * from './utils/index.js';
9+
export * from './user-profile-app.extension.js';
10+
export * from './current-user-action.extension.js';
911

1012
export type * from './types.js';

src/packages/user/current-user/mfa-login/configure-mfa-providers-action.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { UMB_CURRENT_USER_MFA_MODAL } from '../modals/current-user-mfa/current-user-mfa-modal.token.js';
2+
import type { UmbCurrentUserAction, UmbCurrentUserActionArgs } from '../current-user-action.extension.js';
23
import { UmbActionBase } from '@umbraco-cms/backoffice/action';
3-
import type { UmbCurrentUserAction, UmbCurrentUserActionArgs } from '@umbraco-cms/backoffice/extension-registry';
44
import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';
55

66
export class UmbConfigureMfaProvidersApi<ArgsMetaType = never>

src/packages/user/current-user/profile/change-password-current-user.action.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { UMB_CURRENT_USER_CONTEXT } from '../current-user.context.token.js';
22
import { UmbCurrentUserRepository } from '../repository/index.js';
3+
import type { UmbCurrentUserAction, UmbCurrentUserActionArgs } from '../current-user-action.extension.js';
34
import { UmbActionBase } from '@umbraco-cms/backoffice/action';
4-
import type { UmbCurrentUserAction, UmbCurrentUserActionArgs } from '@umbraco-cms/backoffice/extension-registry';
55
import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
66
import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';
77
import { UMB_CHANGE_PASSWORD_MODAL } from '@umbraco-cms/backoffice/user-change-password';

src/packages/user/current-user/profile/edit-current-user.action.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { UMB_CURRENT_USER_CONTEXT } from '../current-user.context.token.js';
2+
import type { UmbCurrentUserAction, UmbCurrentUserActionArgs } from '../current-user-action.extension.js';
23
import { UMB_USER_WORKSPACE_PATH } from '@umbraco-cms/backoffice/user';
34
import { UmbActionBase } from '@umbraco-cms/backoffice/action';
4-
import type { UmbCurrentUserAction, UmbCurrentUserActionArgs } from '@umbraco-cms/backoffice/extension-registry';
55
import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
66

77
export class UmbEditCurrentUserAction<ArgsMetaType = never>

src/packages/core/extension-registry/models/user-profile-app.model.ts renamed to src/packages/user/current-user/user-profile-app.extension.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,9 @@ export interface MetaUserProfileApp {
99
label: string;
1010
pathname: string;
1111
}
12+
13+
declare global {
14+
interface UmbExtensionManifestMap {
15+
umbUserProfileApp: ManifestUserProfileApp;
16+
}
17+
}

0 commit comments

Comments
 (0)