From 87e7886355449fa39373dd6e8256a1a8d4deaa08 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Mon, 30 Sep 2024 10:31:11 +0200 Subject: [PATCH 1/3] move files --- .../src/packages/core/extension-registry/models/index.ts | 3 --- .../user-permission/user-granular-permission.extension.ts} | 0 2 files changed, 3 deletions(-) rename src/Umbraco.Web.UI.Client/src/packages/{core/extension-registry/models/user-granular-permission.model.ts => user/user-permission/user-granular-permission.extension.ts} (100%) 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 67f58875e1..d35cdb43be 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 @@ -34,7 +34,6 @@ 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 { ManifestEntityUserPermission } from './entity-user-permission.model.js'; -import type { ManifestGranularUserPermission } from './user-granular-permission.model.js'; import type { ManifestMfaLoginProvider } from './mfa-login-provider.model.js'; import type { ManifestAppEntryPoint } from './app-entry-point.model.js'; import type { ManifestBackofficeEntryPoint } from './backoffice-entry-point.model.js'; @@ -69,7 +68,6 @@ export type * from './store.model.js'; export type * from './tinymce-plugin.model.js'; export type * from './ufm-component.model.js'; export type * from './ufm-filter.model.js'; -export type * from './user-granular-permission.model.js'; export type * from './user-profile-app.model.js'; export type ManifestEntityActions = @@ -106,7 +104,6 @@ export type ManifestTypes = | ManifestFileUploadPreview | ManifestExternalLoginProvider | ManifestGlobalContext - | ManifestGranularUserPermission | ManifestHeaderApp | ManifestHeaderAppButtonKind | ManifestHealthCheck diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/user-granular-permission.model.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-permission/user-granular-permission.extension.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/user-granular-permission.model.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user-permission/user-granular-permission.extension.ts From b61eafcfa95329bda667b8155edc103c4ccebaf9 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Mon, 30 Sep 2024 10:43:46 +0200 Subject: [PATCH 2/3] declare global --- .../documents/documents/user-permissions/manifests.ts | 6 ++---- .../user-group-granular-permission-list.element.ts | 2 +- .../src/packages/user/user-permission/index.ts | 1 + .../user-permission/user-granular-permission.extension.ts | 6 ++++++ 4 files changed, 10 insertions(+), 5 deletions(-) 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 66c22cffa2..40f8ec4a97 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 @@ -18,10 +18,8 @@ import { } from './constants.js'; import { manifests as repositoryManifests } from './repository/manifests.js'; import { manifests as conditionManifests } from './conditions/manifests.js'; -import type { - ManifestGranularUserPermission, - ManifestEntityUserPermission, -} from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestGranularUserPermission } from '@umbraco-cms/backoffice/user-permission'; +import type { ManifestEntityUserPermission } from '@umbraco-cms/backoffice/extension-registry'; const permissions: Array = [ { diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group/components/user-group-granular-permission-list.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group/components/user-group-granular-permission-list.element.ts index 36eeaa9970..edb6f56031 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group/components/user-group-granular-permission-list.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group/components/user-group-granular-permission-list.element.ts @@ -1,7 +1,7 @@ import { UMB_USER_GROUP_WORKSPACE_CONTEXT } from '../user-group-workspace.context-token.js'; import { UmbChangeEvent } from '@umbraco-cms/backoffice/event'; import { createExtensionElement } from '@umbraco-cms/backoffice/extension-api'; -import type { ManifestGranularUserPermission } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestGranularUserPermission } from '@umbraco-cms/backoffice/user-permission'; import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; import { html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-permission/index.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-permission/index.ts index d6f28c19b5..7b5493d9da 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-permission/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-permission/index.ts @@ -1,4 +1,5 @@ export * from './components/index.js'; export * from './modals/index.js'; +export * from './user-granular-permission.extension.js'; export type { UmbUserPermissionModel } from './types.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-permission/user-granular-permission.extension.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-permission/user-granular-permission.extension.ts index e70b2caac2..70801b97b3 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-permission/user-granular-permission.extension.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-permission/user-granular-permission.extension.ts @@ -12,3 +12,9 @@ export interface MetaGranularUserPermission { description?: string; descriptionKey?: string; } + +declare global { + interface UmbExtensionManifestMap { + umbUserGranularPermission: ManifestGranularUserPermission; + } +} From 448e3d19948de773776cc7c7b857409bf035ed42 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Mon, 30 Sep 2024 11:00:43 +0200 Subject: [PATCH 3/3] move entity user permission --- .../src/packages/core/extension-registry/models/index.ts | 3 --- .../input-document-granular-user-permission.element.ts | 6 ++++-- .../documents/documents/user-permissions/manifests.ts | 6 ++++-- .../components/user-group-ref/user-group-ref.element.ts | 2 +- .../input-entity-user-permission.element.ts | 2 +- .../user-permission/entity-user-permission.extension.ts} | 6 ++++++ .../src/packages/user/user-permission/index.ts | 1 + 7 files changed, 17 insertions(+), 9 deletions(-) rename src/Umbraco.Web.UI.Client/src/packages/{core/extension-registry/models/entity-user-permission.model.ts => user/user-permission/entity-user-permission.extension.ts} (75%) 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 d35cdb43be..274ab452e9 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 @@ -33,7 +33,6 @@ import type { ManifestTinyMcePlugin } from './tinymce-plugin.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 { ManifestEntityUserPermission } from './entity-user-permission.model.js'; import type { ManifestMfaLoginProvider } from './mfa-login-provider.model.js'; import type { ManifestAppEntryPoint } from './app-entry-point.model.js'; import type { ManifestBackofficeEntryPoint } from './backoffice-entry-point.model.js'; @@ -50,7 +49,6 @@ export type * from './dashboard.model.js'; export type * from './dynamic-root.model.js'; export type * from './entity-action.model.js'; export type * from './entity-bulk-action.model.js'; -export type * from './entity-user-permission.model.js'; export type * from './entry-point.model.js'; export type * from './file-upload-preview.model.js'; export type * from './external-login-provider.model.js'; @@ -99,7 +97,6 @@ export type ManifestTypes = | ManifestDynamicRootQueryStep | ManifestEntityActions | ManifestEntityBulkAction - | ManifestEntityUserPermission | ManifestEntryPoint | ManifestFileUploadPreview | ManifestExternalLoginProvider diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/user-permissions/input-document-granular-user-permission/input-document-granular-user-permission.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/user-permissions/input-document-granular-user-permission/input-document-granular-user-permission.element.ts index e7d27e5f1b..12c84881d8 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/user-permissions/input-document-granular-user-permission/input-document-granular-user-permission.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/user-permissions/input-document-granular-user-permission/input-document-granular-user-permission.element.ts @@ -7,10 +7,12 @@ import type { UmbModalManagerContext } from '@umbraco-cms/backoffice/modal'; import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal'; import type { UmbDeselectedEvent } from '@umbraco-cms/backoffice/event'; import { UmbChangeEvent, UmbSelectedEvent } from '@umbraco-cms/backoffice/event'; -import type { ManifestEntityUserPermission } from '@umbraco-cms/backoffice/extension-registry'; import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; import { UUIFormControlMixin } from '@umbraco-cms/backoffice/external/uui'; -import { UMB_ENTITY_USER_PERMISSION_MODAL } from '@umbraco-cms/backoffice/user-permission'; +import { + UMB_ENTITY_USER_PERMISSION_MODAL, + type ManifestEntityUserPermission, +} from '@umbraco-cms/backoffice/user-permission'; @customElement('umb-input-document-granular-user-permission') export class UmbInputDocumentGranularUserPermissionElement extends UUIFormControlMixin(UmbLitElement, '') { 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 40f8ec4a97..aa8d4b2c29 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 @@ -18,8 +18,10 @@ import { } from './constants.js'; import { manifests as repositoryManifests } from './repository/manifests.js'; import { manifests as conditionManifests } from './conditions/manifests.js'; -import type { ManifestGranularUserPermission } from '@umbraco-cms/backoffice/user-permission'; -import type { ManifestEntityUserPermission } from '@umbraco-cms/backoffice/extension-registry'; +import type { + ManifestGranularUserPermission, + ManifestEntityUserPermission, +} from '@umbraco-cms/backoffice/user-permission'; const permissions: Array = [ { diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/components/user-group-ref/user-group-ref.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/components/user-group-ref/user-group-ref.element.ts index 1bee8fdac9..10414bc61d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/components/user-group-ref/user-group-ref.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/components/user-group-ref/user-group-ref.element.ts @@ -1,9 +1,9 @@ import { UUIRefNodeElement } from '@umbraco-cms/backoffice/external/uui'; import { customElement, html, property } from '@umbraco-cms/backoffice/external/lit'; import { UmbElementMixin } from '@umbraco-cms/backoffice/element-api'; -import type { ManifestEntityUserPermission } from '@umbraco-cms/backoffice/extension-registry'; import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; import { map } from '@umbraco-cms/backoffice/external/rxjs'; +import type { ManifestEntityUserPermission } from '@umbraco-cms/backoffice/user-permission'; /** * @element umb-user-group-ref diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-permission/components/input-entity-user-permission/input-entity-user-permission.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-permission/components/input-entity-user-permission/input-entity-user-permission.element.ts index 03bcf4fae6..929490742b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-permission/components/input-entity-user-permission/input-entity-user-permission.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-permission/components/input-entity-user-permission/input-entity-user-permission.element.ts @@ -1,5 +1,5 @@ +import type { ManifestEntityUserPermission } from '../../entity-user-permission.extension.js'; import { UmbChangeEvent } from '@umbraco-cms/backoffice/event'; -import type { ManifestEntityUserPermission } from '@umbraco-cms/backoffice/extension-registry'; import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; import { html, customElement, property, state, nothing, ifDefined } from '@umbraco-cms/backoffice/external/lit'; import type { UmbObserverController } from '@umbraco-cms/backoffice/observable-api'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/entity-user-permission.model.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-permission/entity-user-permission.extension.ts similarity index 75% rename from src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/entity-user-permission.model.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/user-permission/entity-user-permission.extension.ts index db8ed1e2e2..3b9f7ccbf9 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/entity-user-permission.model.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-permission/entity-user-permission.extension.ts @@ -12,3 +12,9 @@ export interface MetaEntityUserPermission { description?: string; group?: string; } + +declare global { + interface UmbExtensionManifestMap { + umbEntityUserPermission: ManifestEntityUserPermission; + } +} diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-permission/index.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-permission/index.ts index 7b5493d9da..856a12661c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-permission/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-permission/index.ts @@ -1,5 +1,6 @@ export * from './components/index.js'; export * from './modals/index.js'; export * from './user-granular-permission.extension.js'; +export * from './entity-user-permission.extension.js'; export type { UmbUserPermissionModel } from './types.js';