diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/index.ts index 85e77b5622..9a03228df5 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/index.ts @@ -28,7 +28,7 @@ import type { ManifestWorkspace } from './workspace.model.js'; import type { ManifestWorkspaceAction } from './workspace-action.model.js'; import type { ManifestWorkspaceEditorView } from './workspace-editor-view.model.js'; import type { ManifestWorkspaceViewCollection } from './workspace-view-collection.model.js'; -import type { ManifestPermission } from './permission.model.js'; +import type { ManifestUserPermission } from './user-permission.model.js'; import type { ManifestBase, ManifestBundle, @@ -66,7 +66,7 @@ export * from './workspace-action.model.js'; export * from './workspace-view-collection.model.js'; export * from './workspace-editor-view.model.js'; export * from './workspace.model.js'; -export * from './permission.model.js'; +export * from './user-permission.model.js'; export type ManifestTypes = | ManifestBundle @@ -108,5 +108,5 @@ export type ManifestTypes = | ManifestWorkspaceAction | ManifestWorkspaceEditorView | ManifestWorkspaceViewCollection - | ManifestPermission + | ManifestUserPermission | ManifestBase; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/permission.model.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/permission.model.ts deleted file mode 100644 index 0b54e1f925..0000000000 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/permission.model.ts +++ /dev/null @@ -1,12 +0,0 @@ -import type { ManifestBase } from '@umbraco-cms/backoffice/extension-api'; - -export interface ManifestPermission extends ManifestBase { - type: 'permission'; - meta: MetaPermission; -} - -export interface MetaPermission { - label: string; - description?: string; - group?: string; -} diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/user-permission.model.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/user-permission.model.ts new file mode 100644 index 0000000000..8f9738a373 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/user-permission.model.ts @@ -0,0 +1,12 @@ +import type { ManifestBase } from '@umbraco-cms/backoffice/extension-api'; + +export interface ManifestUserPermission extends ManifestBase { + type: 'userPermission'; + meta: MetaUserPermission; +} + +export interface MetaUserPermission { + label: string; + description?: string; + group?: string; +} diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/user-permissions/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/user-permissions/manifests.ts index 65a723424a..4e5c1434d4 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/user-permissions/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/user-permissions/manifests.ts @@ -1,6 +1,6 @@ -import type { ManifestPermission } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestUserPermission } from '@umbraco-cms/backoffice/extension-registry'; -const permissions: Array = [ +const permissions: Array = [ { type: 'userPermission', alias: 'Umb.UserPermission.Document.Browse', diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/workspace/user-group-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/workspace/user-group-workspace-editor.element.ts index f2f063bf62..3cdbeeae16 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/workspace/user-group-workspace-editor.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/workspace/user-group-workspace-editor.element.ts @@ -11,7 +11,7 @@ import { UmbModalManagerContext, } from '@umbraco-cms/backoffice/modal'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; -import { ManifestPermission, umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; +import { ManifestUserPermission, umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; @customElement('umb-user-group-workspace-editor') @@ -23,7 +23,7 @@ export class UmbUserGroupWorkspaceEditorElement extends UmbLitElement { private _userKeys?: Array; @state() - private _userPermissions: Array = []; + private _userPermissions: Array = []; #workspaceContext?: typeof UMB_USER_GROUP_WORKSPACE_CONTEXT.TYPE; #modalContext?: UmbModalManagerContext; @@ -110,7 +110,7 @@ export class UmbUserGroupWorkspaceEditorElement extends UmbLitElement { `; } - #renderPermission(permissionManifest: ManifestPermission) { + #renderPermission(permissionManifest: ManifestUserPermission) { return html`