Merge branch 'main' into 14/bugfix/close-context-menu-when-using-primary-action

madsrasmussen · web-flow · commit 87ad50280510 · 2024-06-05T13:45:43.000+02:00
diff --git a/package.json b/package.json
@@ -70,6 +70,7 @@
 		"./repository": "./dist-cms/packages/core/repository/index.js",
 		"./resources": "./dist-cms/packages/core/resources/index.js",
 		"./router": "./dist-cms/packages/core/router/index.js",
+		"./script": "./dist-cms/packages/templating/scripts/index.js",
 		"./search": "./dist-cms/packages/search/index.js",
 		"./section": "./dist-cms/packages/core/section/index.js",
 		"./settings": "./dist-cms/packages/settings/index.js",
diff --git a/src/packages/members/member-group/index.ts b/src/packages/members/member-group/index.ts
@@ -4,3 +4,5 @@ export * from './entity.js';
 export * from './repository/index.js';
 export * from './components/index.js';
 export type { UmbMemberGroupDetailModel } from './types.js';
+
+export { UMB_MEMBER_GROUP_PICKER_MODAL } from './components/member-group-picker-modal/index.js';
diff --git a/src/packages/members/member/components/index.ts b/src/packages/members/member/components/index.ts
@@ -1,5 +1,6 @@
 import './input-member/input-member.element.js';
 
 export * from './input-member/input-member.element.js';
-
 export * from './member-picker-modal/member-picker-modal.element.js';
+
+export { UMB_MEMBER_PICKER_MODAL } from './member-picker-modal/index.js';
diff --git a/src/packages/templating/components/templating-item-menu/templating-item-menu.element.ts b/src/packages/templating/components/templating-item-menu/templating-item-menu.element.ts
@@ -1,11 +1,11 @@
-import { UMB_PARTIAL_VIEW_PICKER_MODAL } from '../../modals/partial-view-picker/partial-view-picker-modal.token.js';
 import { UMB_TEMPLATING_PAGE_FIELD_BUILDER_MODAL } from '../../modals/templating-page-field-builder/templating-page-field-builder-modal.token.js';
 import { CodeSnippetType } from '../../types.js';
 import {
 	UMB_TEMPLATING_ITEM_PICKER_MODAL,
 	type UmbTemplatingItemPickerModalValue,
 } from '../../modals/templating-item-picker/templating-item-picker-modal.token.js';
 import { getInsertDictionarySnippet, getInsertPartialSnippet } from '../../utils/index.js';
+import { UMB_PARTIAL_VIEW_PICKER_MODAL } from '@umbraco-cms/backoffice/partial-view';
 import { UmbDictionaryDetailRepository, UMB_DICTIONARY_PICKER_MODAL } from '@umbraco-cms/backoffice/dictionary';
 import { customElement, property, css, html } from '@umbraco-cms/backoffice/external/lit';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
diff --git a/src/packages/templating/modals/index.ts b/src/packages/templating/modals/index.ts
@@ -1,4 +1,3 @@
 export * from './templating-section-picker/index.js';
 export * from './templating-item-picker/index.js';
-export * from './partial-view-picker/index.js';
 export * from './templating-page-field-builder/index.js';
diff --git a/src/packages/templating/modals/templating-item-picker/templating-item-picker-modal.element.ts b/src/packages/templating/modals/templating-item-picker/templating-item-picker-modal.element.ts
@@ -1,10 +1,10 @@
 import { CodeSnippetType } from '../../types.js';
-import { UMB_PARTIAL_VIEW_PICKER_MODAL } from '../partial-view-picker/partial-view-picker-modal.token.js';
 import { UMB_TEMPLATING_PAGE_FIELD_BUILDER_MODAL } from '../templating-page-field-builder/templating-page-field-builder-modal.token.js';
 import type {
 	UmbTemplatingItemPickerModalData,
 	UmbTemplatingItemPickerModalValue,
 } from './templating-item-picker-modal.token.js';
+import { UMB_PARTIAL_VIEW_PICKER_MODAL } from '@umbraco-cms/backoffice/partial-view';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import { css, html, customElement } from '@umbraco-cms/backoffice/external/lit';
 import type { UmbModalManagerContext } from '@umbraco-cms/backoffice/modal';
diff --git a/src/packages/templating/partial-views/components/input-partial-view/input-partial-view.context.ts b/src/packages/templating/partial-views/components/input-partial-view/input-partial-view.context.ts
@@ -1,5 +1,5 @@
 import { UMB_PARTIAL_VIEW_ITEM_REPOSITORY_ALIAS } from '../../repository/item/index.js';
-import { UMB_PARTIAL_VIEW_PICKER_MODAL } from '../../../modals/partial-view-picker/partial-view-picker-modal.token.js';
+import { UMB_PARTIAL_VIEW_PICKER_MODAL } from '../../partial-view-picker/index.js';
 import type { UmbPartialViewItemModel } from '../../types.js';
 import { UmbPickerInputContext } from '@umbraco-cms/backoffice/picker-input';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
diff --git a/src/packages/templating/partial-views/index.ts b/src/packages/templating/partial-views/index.ts
@@ -1,2 +1,4 @@
 export * from './repository/index.js';
 export * from './entity.js';
+
+export { UMB_PARTIAL_VIEW_PICKER_MODAL } from './partial-view-picker/index.js';
diff --git a/src/packages/templating/partial-views/partial-view-picker/index.ts b/src/packages/templating/partial-views/partial-view-picker/index.ts
diff --git a/src/packages/templating/partial-views/partial-view-picker/partial-view-picker-modal.token.ts b/src/packages/templating/partial-views/partial-view-picker/partial-view-picker-modal.token.ts
diff --git a/src/packages/templating/scripts/components/input-script/input-script.context.ts b/src/packages/templating/scripts/components/input-script/input-script.context.ts
@@ -1,13 +1,11 @@
 import { UMB_SCRIPT_ITEM_REPOSITORY_ALIAS } from '../../repository/item/index.js';
 import { UMB_SCRIPT_PICKER_MODAL } from '../../modals/script-picker-modal.token.js';
-import type { UmbScriptItemModel } from '../../index.js';
+import type { UmbScriptItemModel, UmbScriptTreeItemModel } from '../../index.js';
 import { UmbPickerInputContext } from '@umbraco-cms/backoffice/picker-input';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 
-export class UmbScriptPickerContext extends UmbPickerInputContext<UmbScriptItemModel> {
+export class UmbScriptPickerContext extends UmbPickerInputContext<UmbScriptItemModel, UmbScriptTreeItemModel> {
 	constructor(host: UmbControllerHost) {
-		// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-		// @ts-ignore
 		super(host, UMB_SCRIPT_ITEM_REPOSITORY_ALIAS, UMB_SCRIPT_PICKER_MODAL);
 	}
 }
diff --git a/src/packages/templating/scripts/index.ts b/src/packages/templating/scripts/index.ts
@@ -3,3 +3,5 @@ export * from './workspace/script-workspace.context-token.js';
 export * from './tree/index.js';
 export * from './types.js';
 export * from './entity.js';
+
+export { UMB_SCRIPT_PICKER_MODAL } from './modals/script-picker-modal.token.js';
diff --git a/src/packages/templating/stylesheets/components/index.ts b/src/packages/templating/stylesheets/components/index.ts
@@ -5,3 +5,5 @@ import './stylesheet-rule-ref/stylesheet-rule-ref.element.js';
 export * from './stylesheet-input/stylesheet-input.element.js';
 export * from './stylesheet-rule-input/stylesheet-rule-input.element.js';
 export * from './stylesheet-rule-ref/stylesheet-rule-ref.element.js';
+
+export { UMB_STYLESHEET_PICKER_MODAL } from './stylesheet-input/index.js';
diff --git a/src/packages/templating/stylesheets/components/stylesheet-input/index.ts b/src/packages/templating/stylesheets/components/stylesheet-input/index.ts
@@ -0,0 +1 @@
+export { UMB_STYLESHEET_PICKER_MODAL } from './stylesheet-picker-modal.token.js';
diff --git a/src/packages/templating/stylesheets/index.ts b/src/packages/templating/stylesheets/index.ts
@@ -8,6 +8,7 @@ export { UmbStylesheetTreeRepository } from './tree/index.js';
 // Components
 export { UmbStylesheetRuleInputElement } from './components/index.js';
 export { UmbStylesheetInputElement } from './components/index.js';
+export { UMB_STYLESHEET_PICKER_MODAL } from './components/index.js';
 
 // Utils
 export { UmbStylesheetRuleManager } from './utils/index.js';
diff --git a/src/packages/user/user/index.ts b/src/packages/user/user/index.ts
@@ -5,3 +5,5 @@ export * from './repository/index.js';
 export type * from './types.js';
 export * from './utils/index.js';
 export * from './entity.js';
+
+export { UMB_USER_PICKER_MODAL } from './modals/user-picker/index.js';
diff --git a/src/packages/user/user/modals/user-picker/index.ts b/src/packages/user/user/modals/user-picker/index.ts
@@ -0,0 +1 @@
+export { UMB_USER_PICKER_MODAL } from './user-picker-modal.token.js';
diff --git a/tsconfig.json b/tsconfig.json
@@ -95,6 +95,7 @@ DON'T EDIT THIS FILE DIRECTLY. It is generated by /devops/tsconfig/index.js
 			"@umbraco-cms/backoffice/repository": ["./src/packages/core/repository/index.ts"],
 			"@umbraco-cms/backoffice/resources": ["./src/packages/core/resources/index.ts"],
 			"@umbraco-cms/backoffice/router": ["./src/packages/core/router/index.ts"],
+			"@umbraco-cms/backoffice/script": ["./src/packages/templating/scripts/index.ts"],
 			"@umbraco-cms/backoffice/search": ["./src/packages/search/index.ts"],
 			"@umbraco-cms/backoffice/section": ["./src/packages/core/section/index.ts"],
 			"@umbraco-cms/backoffice/settings": ["./src/packages/settings/index.ts"],
