Merge pull request #2328 from umbraco/v15/fix/move-user-permission-se…

…ttings-token

Fix: move user permission settings token

src/packages/core/manifests.ts

@@ -10,7 +10,7 @@ import { manifests as extensionManifests } from './extension-registry/manifests.
 import { manifests as iconRegistryManifests } from './icon-registry/manifests.js';
 import { manifests as localizationManifests } from './localization/manifests.js';
 import { manifests as menuManifests } from './menu/manifests.js';
-import { manifests as modalManifests } from './modal/common/manifests.js';
+import { manifests as modalManifests } from './modal/manifests.js';
 import { manifests as pickerManifests } from './picker/manifests.js';
 import { manifests as propertyActionManifests } from './property-action/manifests.js';
 import { manifests as propertyManifests } from './property/manifests.js';

src/packages/core/modal/common/confirm/confirm-modal.controller.ts

@@ -1,5 +1,5 @@
-import { UMB_CONFIRM_MODAL, type UmbConfirmModalData } from '../../token/confirm-modal.token.js';
-import { UMB_MODAL_MANAGER_CONTEXT } from '../../context/modal-manager.context.js';
+import { UMB_MODAL_MANAGER_CONTEXT } from '../../context/index.js';
+import { UMB_CONFIRM_MODAL, type UmbConfirmModalData } from './confirm-modal.token.js';
 import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 

src/packages/core/modal/token/confirm-modal.token.ts → src/packages/core/modal/common/confirm/confirm-modal.token.ts

@@ -1,4 +1,4 @@
-import { UmbModalToken } from './modal-token.js';
+import { UmbModalToken } from '../../token/index.js';
 import type { TemplateResult } from '@umbraco-cms/backoffice/external/lit';
 
 export interface UmbConfirmModalData {

src/packages/core/modal/common/confirm/index.ts

@@ -0,0 +1,2 @@
+export * from './confirm-modal.token.js';
+export * from './confirm-modal.controller.js';

src/packages/core/modal/common/confirm/manifests.ts

@@ -0,0 +1,8 @@
+export const manifests: Array<UmbExtensionManifest> = [
+	{
+		type: 'modal',
+		alias: 'Umb.Modal.Confirm',
+		name: 'Confirm Modal',
+		element: () => import('./confirm-modal.element.js'),
+	},
+];

src/packages/core/modal/common/index.ts

@@ -1 +1,3 @@
 export * from './embedded-media/index.js';
+export * from './confirm/index.js';
+export * from './item-picker/index.js';

src/packages/core/modal/common/item-picker/index.ts

@@ -0,0 +1 @@
+export * from './item-picker-modal.token.js';

src/packages/core/modal/token/item-picker-modal.token.ts → src/packages/core/modal/common/item-picker/item-picker-modal.token.ts

@@ -1,4 +1,4 @@
-import { UmbModalToken } from './modal-token.js';
+import { UmbModalToken } from '../../token/index.js';
 
 export type UmbItemPickerModalData = {
 	headline: string;

src/packages/core/modal/common/item-picker/manifests.ts

@@ -0,0 +1,8 @@
+export const manifests: Array<UmbExtensionManifest> = [
+	{
+		type: 'modal',
+		alias: 'Umb.Modal.ItemPicker',
+		name: 'Item Picker Modal',
+		element: () => import('./item-picker-modal.element.js'),
+	},
+];

src/packages/core/modal/common/manifests.ts

@@ -1,20 +1,13 @@
+import { manifests as confirmManifests } from './confirm/manifests.js';
+import { manifests as itemPickerManifests } from './item-picker/manifests.js';
+
 export const manifests: Array<UmbExtensionManifest> = [
-	{
-		type: 'modal',
-		alias: 'Umb.Modal.Confirm',
-		name: 'Confirm Modal',
-		element: () => import('./confirm/confirm-modal.element.js'),
-	},
 	{
 		type: 'modal',
 		alias: 'Umb.Modal.EmbeddedMedia',
 		name: 'Embedded Media Modal',
 		element: () => import('./embedded-media/embedded-media-modal.element.js'),
 	},
-	{
-		type: 'modal',
-		alias: 'Umb.Modal.ItemPicker',
-		name: 'Item Picker Modal',
-		element: () => import('./item-picker/item-picker-modal.element.js'),
-	},
+	...confirmManifests,
+	...itemPickerManifests,
 ];

src/packages/core/modal/index.ts

@@ -5,4 +5,4 @@ export * from './token/index.js';
 export * from './types.js';
 export * from './component/modal-base.element.js';
 export * from './component/modal.element.js';
-export * from './common/confirm/confirm-modal.controller.js';
+export * from './common/index.js';

src/packages/core/modal/manifests.ts

@@ -0,0 +1,3 @@
+import { manifests as commonManifests } from './common/manifests.js';
+
+export const manifests: Array<UmbExtensionManifest> = [...commonManifests];

src/packages/core/modal/token/index.ts

@@ -1,7 +1,4 @@
 export * from './change-password-modal.token.js';
-export * from './confirm-modal.token.js';
 export * from './embedded-media-modal.token.js';
-export * from './entity-user-permission-settings-modal.token.js';
-export * from './item-picker-modal.token.js';
 export * from './modal-token.js';
 export * from './property-editor-ui-picker-modal.token.js';

src/packages/documents/documents/user-permissions/input-document-granular-user-permission/input-document-granular-user-permission.element.ts

@@ -4,12 +4,13 @@ import { UMB_DOCUMENT_PICKER_MODAL } from '../../modals/index.js';
 import { css, customElement, html, repeat, state } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import type { UmbModalManagerContext } from '@umbraco-cms/backoffice/modal';
-import { UMB_ENTITY_USER_PERMISSION_MODAL, UMB_MODAL_MANAGER_CONTEXT } 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';
 
 @customElement('umb-input-document-granular-user-permission')
 export class UmbInputDocumentGranularUserPermissionElement extends UUIFormControlMixin(UmbLitElement, '') {

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

@@ -1,3 +1,4 @@
 export * from './components/index.js';
+export * from './modals/index.js';
 
 export type { UmbUserPermissionModel } from './types.js';

src/packages/user/user-permission/modals/index.ts

@@ -0,0 +1 @@
+export * from './settings/index.js';

src/packages/user/user-permission/modals/manifests.ts

@@ -1,8 +1,3 @@
-export const manifests: Array<UmbExtensionManifest> = [
-	{
-		type: 'modal',
-		alias: 'Umb.Modal.EntityUserPermissionSettings',
-		name: 'Entity User Permission Settings Modal',
-		js: () => import('./settings/entity-user-permission-settings-modal.element.js'),
-	},
-];
+import { manifests as settingsManifests } from './settings/manifests.js';
+
+export const manifests: Array<UmbExtensionManifest> = [...settingsManifests];

src/packages/user/user-permission/modals/settings/entity-user-permission-settings-modal.element.ts

@@ -1,9 +1,9 @@
-import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
-import { html, customElement, css, nothing, state } from '@umbraco-cms/backoffice/external/lit';
 import type {
 	UmbEntityUserPermissionSettingsModalData,
 	UmbEntityUserPermissionSettingsModalValue,
-} from '@umbraco-cms/backoffice/modal';
+} from './entity-user-permission-settings-modal.token.js';
+import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
+import { html, customElement, css, nothing, state } from '@umbraco-cms/backoffice/external/lit';
 import { UmbModalBaseElement } from '@umbraco-cms/backoffice/modal';
 import type { UmbSelectionChangeEvent } from '@umbraco-cms/backoffice/event';
 

src/packages/core/modal/token/entity-user-permission-settings-modal.token.ts → src/packages/user/user-permission/modals/settings/entity-user-permission-settings-modal.token.ts

@@ -1,4 +1,4 @@
-import { UmbModalToken } from './modal-token.js';
+import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
 
 export interface UmbEntityUserPermissionSettingsModalData {
 	unique: string;

src/packages/user/user-permission/modals/settings/index.ts

@@ -0,0 +1 @@
+export * from './entity-user-permission-settings-modal.token.js';

src/packages/user/user-permission/modals/settings/manifests.ts

@@ -0,0 +1,8 @@
+export const manifests: Array<UmbExtensionManifest> = [
+	{
+		type: 'modal',
+		alias: 'Umb.Modal.EntityUserPermissionSettings',
+		name: 'Entity User Permission Settings Modal',
+		js: () => import('./entity-user-permission-settings-modal.element.js'),
+	},
+];