diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json index 113875308d..371a99763b 100644 --- a/src/Umbraco.Web.UI.Client/package.json +++ b/src/Umbraco.Web.UI.Client/package.json @@ -63,6 +63,7 @@ "./member-group": "./dist-cms/packages/members/member-group/index.js", "./member-type": "./dist-cms/packages/members/member-type/index.js", "./member": "./dist-cms/packages/members/member/index.js", + "./member-public-access": "./dist-cms/packages/members/member-public-access/index.js", "./menu": "./dist-cms/packages/core/menu/index.js", "./modal": "./dist-cms/packages/core/modal/index.js", "./models": "./dist-cms/packages/core/models/index.js", diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/constants.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/constants.ts index 9f6ce0f25a..0fecd0b052 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/constants.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/constants.ts @@ -4,5 +4,4 @@ export * from './culture-and-hostnames/constants.js'; export * from './duplicate/constants.js'; export * from './move-to/constants.js'; export * from './notifications/constants.js'; -export * from './public-access/constants.js'; export * from './sort-children-of/constants.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/index.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/index.ts index 0570228f3e..bd7b79f82e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/index.ts @@ -1,3 +1,2 @@ -export * from './public-access/index.js'; export * from './culture-and-hostnames/index.js'; export * from './sort-children-of/index.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/manifests.ts index ecbb1a7e5c..c9853b8343 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/manifests.ts @@ -8,7 +8,6 @@ import { manifests as createManifests } from './create/manifests.js'; import { manifests as cultureAndHostnamesManifests } from './culture-and-hostnames/manifests.js'; import { manifests as duplicateManifests } from './duplicate/manifests.js'; import { manifests as moveManifests } from './move-to/manifests.js'; -import { manifests as publicAccessManifests } from './public-access/manifests.js'; import { manifests as sortChildrenOfManifests } from './sort-children-of/manifests.js'; import { manifests as notificationManifests } from './notifications/manifests.js'; import { UMB_ENTITY_IS_TRASHED_CONDITION_ALIAS } from '@umbraco-cms/backoffice/recycle-bin'; @@ -67,7 +66,6 @@ export const manifests: Array = [ ...cultureAndHostnamesManifests, ...duplicateManifests, ...moveManifests, - ...publicAccessManifests, ...sortChildrenOfManifests, ...entityActions, ...notificationManifests, diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/public-access/index.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/public-access/index.ts deleted file mode 100644 index 28d9f38fba..0000000000 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/public-access/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './modal/index.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/public-access/modal/index.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/public-access/modal/index.ts deleted file mode 100644 index aef6a90d2f..0000000000 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/public-access/modal/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './public-access-modal.element.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/members/manifests.ts index 8510e02c1e..54398e8e59 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/members/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/manifests.ts @@ -1,5 +1,6 @@ import { manifests as memberGroupManifests } from './member-group/manifests.js'; import { manifests as memberManifests } from './member/manifests.js'; +import { manifests as memberPublicAccessManifests } from './member-public-access/manifests.js'; import { manifests as memberTypeManifests } from './member-type/manifests.js'; import { manifests as sectionManifests } from './section/manifests.js'; @@ -11,6 +12,7 @@ import './member-group/components/index.js'; export const manifests: Array = [ ...memberGroupManifests, ...memberManifests, + ...memberPublicAccessManifests, ...memberTypeManifests, ...sectionManifests, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/public-access/constants.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-public-access/constants.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/public-access/constants.ts rename to src/Umbraco.Web.UI.Client/src/packages/members/member-public-access/constants.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member-public-access/index.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-public-access/index.ts new file mode 100644 index 0000000000..0273dec301 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/members/member-public-access/index.ts @@ -0,0 +1,2 @@ +export * from './constants.js'; +export type * from './types.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/public-access/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-public-access/manifests.ts similarity index 80% rename from src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/public-access/manifests.ts rename to src/Umbraco.Web.UI.Client/src/packages/members/member-public-access/manifests.ts index 354dbf2f57..97aac8091e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/public-access/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/member-public-access/manifests.ts @@ -1,7 +1,7 @@ -import { UMB_DOCUMENT_ENTITY_TYPE } from '../../entity.js'; -import { UMB_USER_PERMISSION_DOCUMENT_PUBLIC_ACCESS } from '../../user-permissions/index.js'; import { UMB_SECTION_USER_PERMISSION_CONDITION_ALIAS } from '@umbraco-cms/backoffice/section'; import { UMB_ENTITY_IS_NOT_TRASHED_CONDITION_ALIAS } from '@umbraco-cms/backoffice/recycle-bin'; +import { UMB_DOCUMENT_ENTITY_TYPE, UMB_USER_PERMISSION_DOCUMENT_PUBLIC_ACCESS } from '@umbraco-cms/backoffice/document'; +import { UMB_MEMBER_MANAGEMENT_SECTION_ALIAS } from '../section/constants.js'; export const manifests: Array = [ { @@ -27,7 +27,7 @@ export const manifests: Array = [ }, { alias: UMB_SECTION_USER_PERMISSION_CONDITION_ALIAS, - match: 'Umb.Section.Members', + match: UMB_MEMBER_MANAGEMENT_SECTION_ALIAS, }, ], }, diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/public-access/modal/constants.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-public-access/modal/constants.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/public-access/modal/constants.ts rename to src/Umbraco.Web.UI.Client/src/packages/members/member-public-access/modal/constants.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/public-access/modal/public-access-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-public-access/modal/public-access-modal.element.ts similarity index 98% rename from src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/public-access/modal/public-access-modal.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/members/member-public-access/modal/public-access-modal.element.ts index 90d08daedc..8a08a84b0d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/public-access/modal/public-access-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/member-public-access/modal/public-access-modal.element.ts @@ -1,7 +1,5 @@ import { UmbDocumentPublicAccessRepository } from '../repository/public-access.repository.js'; -import { UmbDocumentItemRepository } from '../../../item/index.js'; -import type { UmbInputDocumentElement } from '../../../components/index.js'; -import type { UmbPublicAccessModalData, UmbPublicAccessModalValue } from './public-access-modal.token.js'; +import type { UmbPublicAccessModalData, UmbPublicAccessModalValue } from './types.js'; import { css, customElement, html, nothing, state } from '@umbraco-cms/backoffice/external/lit'; import { UmbModalBaseElement } from '@umbraco-cms/backoffice/modal'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; @@ -9,6 +7,7 @@ import { UmbMemberDetailRepository, type UmbInputMemberElement } from '@umbraco- import { UmbMemberGroupItemRepository, type UmbInputMemberGroupElement } from '@umbraco-cms/backoffice/member-group'; import type { PublicAccessRequestModel } from '@umbraco-cms/backoffice/external/backend-api'; import type { UUIRadioEvent } from '@umbraco-cms/backoffice/external/uui'; +import { UmbDocumentItemRepository, type UmbInputDocumentElement } from '@umbraco-cms/backoffice/document'; @customElement('umb-public-access-modal') export class UmbPublicAccessModalElement extends UmbModalBaseElement< diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/public-access/modal/public-access-modal.token.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-public-access/modal/public-access-modal.token.ts similarity index 59% rename from src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/public-access/modal/public-access-modal.token.ts rename to src/Umbraco.Web.UI.Client/src/packages/members/member-public-access/modal/public-access-modal.token.ts index 57f3143a5d..b5711b187c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/public-access/modal/public-access-modal.token.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/member-public-access/modal/public-access-modal.token.ts @@ -1,11 +1,5 @@ import { UmbModalToken } from '@umbraco-cms/backoffice/modal'; - -export interface UmbPublicAccessModalData { - unique: string; -} - -// eslint-disable-next-line @typescript-eslint/no-empty-object-type -export interface UmbPublicAccessModalValue {} +import type { UmbPublicAccessModalData, UmbPublicAccessModalValue } from './types.js'; export const UMB_PUBLIC_ACCESS_MODAL = new UmbModalToken( 'Umb.Modal.PublicAccess', diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member-public-access/modal/types.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-public-access/modal/types.ts new file mode 100644 index 0000000000..96c16c3084 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/members/member-public-access/modal/types.ts @@ -0,0 +1,6 @@ +export interface UmbPublicAccessModalData { + unique: string; +} + +// eslint-disable-next-line @typescript-eslint/no-empty-object-type +export interface UmbPublicAccessModalValue {} diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/public-access/public-access.action.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-public-access/public-access.action.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/public-access/public-access.action.ts rename to src/Umbraco.Web.UI.Client/src/packages/members/member-public-access/public-access.action.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/public-access/repository/constants.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-public-access/repository/constants.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/public-access/repository/constants.ts rename to src/Umbraco.Web.UI.Client/src/packages/members/member-public-access/repository/constants.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/public-access/repository/index.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-public-access/repository/index.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/public-access/repository/index.ts rename to src/Umbraco.Web.UI.Client/src/packages/members/member-public-access/repository/index.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/public-access/repository/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-public-access/repository/manifests.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/public-access/repository/manifests.ts rename to src/Umbraco.Web.UI.Client/src/packages/members/member-public-access/repository/manifests.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/public-access/repository/public-access.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-public-access/repository/public-access.repository.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/public-access/repository/public-access.repository.ts rename to src/Umbraco.Web.UI.Client/src/packages/members/member-public-access/repository/public-access.repository.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/public-access/repository/public-access.server.data.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-public-access/repository/public-access.server.data.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/public-access/repository/public-access.server.data.ts rename to src/Umbraco.Web.UI.Client/src/packages/members/member-public-access/repository/public-access.server.data.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member-public-access/types.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-public-access/types.ts new file mode 100644 index 0000000000..4aeeacf57d --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/members/member-public-access/types.ts @@ -0,0 +1 @@ +export type * from './modal/types.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/vite.config.ts b/src/Umbraco.Web.UI.Client/src/packages/members/vite.config.ts index 872e17ea3f..a4ec525fec 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/members/vite.config.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/vite.config.ts @@ -13,6 +13,7 @@ export default defineConfig({ entry: { 'member/index': 'member/index.ts', 'member-group/index': 'member-group/index.ts', + 'member-public-access/index': 'member-public-access/index.ts', 'member-type/index': 'member-type/index.ts', 'umbraco-package': 'umbraco-package.ts', manifests: 'manifests.ts', diff --git a/src/Umbraco.Web.UI.Client/tsconfig.json b/src/Umbraco.Web.UI.Client/tsconfig.json index 949fb3d2da..4470ea1776 100644 --- a/src/Umbraco.Web.UI.Client/tsconfig.json +++ b/src/Umbraco.Web.UI.Client/tsconfig.json @@ -92,6 +92,7 @@ DON'T EDIT THIS FILE DIRECTLY. It is generated by /devops/tsconfig/index.js "@umbraco-cms/backoffice/member-group": ["./src/packages/members/member-group/index.ts"], "@umbraco-cms/backoffice/member-type": ["./src/packages/members/member-type/index.ts"], "@umbraco-cms/backoffice/member": ["./src/packages/members/member/index.ts"], + "@umbraco-cms/backoffice/member-public-access": ["./src/packages/members/member-public-access/index.ts"], "@umbraco-cms/backoffice/menu": ["./src/packages/core/menu/index.ts"], "@umbraco-cms/backoffice/modal": ["./src/packages/core/modal/index.ts"], "@umbraco-cms/backoffice/models": ["./src/packages/core/models/index.ts"],