Merge branch 'v15/dev' into v15/feature/emm-section-conditions

nielslyngsoe · web-flow · commit 07e45ef81c18 · 2024-09-13T20:33:20.000+02:00
diff --git a/src/packages/core/extension-registry/models/index.ts b/src/packages/core/extension-registry/models/index.ts
@@ -60,8 +60,6 @@ import type {
 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 { ManifestSearchProvider } from './search-provider.model.js';
-import type { ManifestSearchResultItem } from './search-result-item.model.js';
 import type { ManifestAppEntryPoint } from './app-entry-point.model.js';
 import type { ManifestBackofficeEntryPoint } from './backoffice-entry-point.model.js';
 import type { ManifestEntryPoint } from './entry-point.model.js';
@@ -97,8 +95,6 @@ export type * from './preview-app.model.js';
 export type * from './property-action.model.js';
 export type * from './property-editor.model.js';
 export type * from './repository.model.js';
-export type * from './search-provider.model.js';
-export type * from './search-result-item.model.js';
 export type * from './section-sidebar-app.model.js';
 export type * from './section-view.model.js';
 export type * from './section.model.js';
@@ -184,8 +180,6 @@ export type ManifestTypes =
 	| ManifestPropertyEditorSchema
 	| ManifestPropertyEditorUi
 	| ManifestRepository
-	| ManifestSearchProvider
-	| ManifestSearchResultItem
 	| ManifestSection
 	| ManifestSectionRoute
 	| ManifestSectionSidebarApp
diff --git a/src/packages/data-type/search/manifests.ts b/src/packages/data-type/search/manifests.ts
@@ -1,7 +1,6 @@
 import { UMB_DATA_TYPE_ENTITY_TYPE } from '../entity.js';
-import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry';
 
-export const manifests: Array<ManifestTypes> = [
+export const manifests: Array<UmbExtensionManifest> = [
 	{
 		name: 'Data Type Search Provider',
 		alias: 'Umb.SearchProvider.DataType',
diff --git a/src/packages/documents/document-types/search/manifests.ts b/src/packages/documents/document-types/search/manifests.ts
@@ -1,8 +1,7 @@
 import { UMB_DOCUMENT_TYPE_ENTITY_TYPE } from '../entity.js';
 import { UMB_DOCUMENT_TYPE_SEARCH_PROVIDER_ALIAS } from './constants.js';
-import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry';
 
-export const manifests: Array<ManifestTypes> = [
+export const manifests: Array<UmbExtensionManifest> = [
 	{
 		name: 'Document Type Search Provider',
 		alias: UMB_DOCUMENT_TYPE_SEARCH_PROVIDER_ALIAS,
diff --git a/src/packages/documents/documents/search/manifests.ts b/src/packages/documents/documents/search/manifests.ts
@@ -1,8 +1,7 @@
 import { UMB_DOCUMENT_ENTITY_TYPE } from '../entity.js';
 import { UMB_DOCUMENT_SEARCH_PROVIDER_ALIAS } from './constants.js';
-import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry';
 
-export const manifests: Array<ManifestTypes> = [
+export const manifests: Array<UmbExtensionManifest> = [
 	{
 		name: 'Document Search Provider',
 		alias: UMB_DOCUMENT_SEARCH_PROVIDER_ALIAS,
diff --git a/src/packages/media/media-types/search/manifests.ts b/src/packages/media/media-types/search/manifests.ts
@@ -1,7 +1,6 @@
 import { UMB_MEDIA_TYPE_ENTITY_TYPE } from '../entity.js';
-import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry';
 
-export const manifests: Array<ManifestTypes> = [
+export const manifests: Array<UmbExtensionManifest> = [
 	{
 		name: 'Media Type Search Provider',
 		alias: 'Umb.SearchProvider.MediaType',
diff --git a/src/packages/media/media/search/manifests.ts b/src/packages/media/media/search/manifests.ts
@@ -1,7 +1,6 @@
 import { UMB_MEDIA_ENTITY_TYPE } from '../entity.js';
-import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry';
 
-export const manifests: Array<ManifestTypes> = [
+export const manifests: Array<UmbExtensionManifest> = [
 	{
 		name: 'Media Search Provider',
 		alias: 'Umb.SearchProvider.Media',
diff --git a/src/packages/members/member-type/search/manifests.ts b/src/packages/members/member-type/search/manifests.ts
@@ -1,7 +1,6 @@
 import { UMB_MEMBER_TYPE_ENTITY_TYPE } from '../entity.js';
-import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry';
 
-export const manifests: Array<ManifestTypes> = [
+export const manifests: Array<UmbExtensionManifest> = [
 	{
 		name: 'Member Type Search Provider',
 		alias: 'Umb.SearchProvider.MemberType',
diff --git a/src/packages/members/member/search/manifests.ts b/src/packages/members/member/search/manifests.ts
@@ -1,8 +1,7 @@
 import { UMB_MEMBER_ENTITY_TYPE } from '../entity.js';
 import { UMB_MEMBER_SEARCH_PROVIDER_ALIAS } from './constants.js';
-import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry';
 
-export const manifests: Array<ManifestTypes> = [
+export const manifests: Array<UmbExtensionManifest> = [
 	{
 		name: 'Member Search Provider',
 		alias: UMB_MEMBER_SEARCH_PROVIDER_ALIAS,
diff --git a/src/packages/search/extensions/index.ts b/src/packages/search/extensions/index.ts
@@ -0,0 +1,2 @@
+export * from './search-provider.extension.js';
+export * from './search-result-item.extension.js';
diff --git a/src/packages/search/extensions/search-provider.extension.ts b/src/packages/search/extensions/search-provider.extension.ts
@@ -1,4 +1,4 @@
-import type { UmbSearchProvider, UmbSearchResultItemModel } from '@umbraco-cms/backoffice/search';
+import type { UmbSearchProvider, UmbSearchResultItemModel } from '../types.js';
 import type { ManifestApi } from '@umbraco-cms/backoffice/extension-api';
 
 /**
@@ -16,3 +16,9 @@ export interface MetaSearchProvider {
 	 */
 	label?: string;
 }
+
+declare global {
+	interface UmbExtensionManifestMap {
+		umbSearchProvider: ManifestSearchProvider;
+	}
+}
diff --git a/src/packages/search/extensions/search-result-item.extension.ts b/src/packages/search/extensions/search-result-item.extension.ts
@@ -7,3 +7,9 @@ export interface ManifestSearchResultItem extends ManifestElement {
 	type: 'searchResultItem';
 	forEntityTypes: Array<string>;
 }
+
+declare global {
+	interface UmbExtensionManifestMap {
+		umbSearchResultItem: ManifestSearchResultItem;
+	}
+}
diff --git a/src/packages/search/index.ts b/src/packages/search/index.ts
@@ -1,3 +1,5 @@
 export type { UmbSearchResultItemModel, UmbSearchRequestArgs, UmbSearchProvider } from './types.js';
 export type { UmbSearchDataSource } from './search-data-source.interface.js';
 export type { UmbSearchRepository } from './search-repository.interface.js';
+
+export * from './extensions/index.js';
diff --git a/src/packages/search/search-modal/search-modal.element.ts b/src/packages/search/search-modal/search-modal.element.ts
@@ -10,13 +10,13 @@ import {
 	state,
 	property,
 } from '@umbraco-cms/backoffice/external/lit';
-import type { ManifestSearchResultItem } from '@umbraco-cms/backoffice/extension-registry';
 import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { UmbExtensionsManifestInitializer, createExtensionApi } from '@umbraco-cms/backoffice/extension-api';
 
 import '../search-result/search-result-item.element.js';
 import type { UmbModalContext } from '@umbraco-cms/backoffice/modal';
+import type { ManifestSearchResultItem } from '../extensions/index.js';
 
 type SearchProvider = {
 	name: string;
diff --git a/src/packages/templating/templates/search/manifests.ts b/src/packages/templating/templates/search/manifests.ts
@@ -1,7 +1,6 @@
 import { UMB_TEMPLATE_ENTITY_TYPE } from '../entity.js';
-import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry';
 
-export const manifests: Array<ManifestTypes> = [
+export const manifests: Array<UmbExtensionManifest> = [
 	{
 		name: 'Template Search Provider',
 		alias: 'Umb.SearchProvider.Template',

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`import { UMB_DATA_TYPE_ENTITY_TYPE } from '../entity.js';`
`2`		`-import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry';`
`3`	`2`
`4`		`-export const manifests: Array<ManifestTypes> = [`
	`3`	`+export const manifests: Array<UmbExtensionManifest> = [`
`5`	`4`	`{`
`6`	`5`	`name: 'Data Type Search Provider',`
`7`	`6`	`alias: 'Umb.SearchProvider.DataType',`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,7 @@`
`1`	`1`	`import { UMB_DOCUMENT_TYPE_ENTITY_TYPE } from '../entity.js';`
`2`	`2`	`import { UMB_DOCUMENT_TYPE_SEARCH_PROVIDER_ALIAS } from './constants.js';`
`3`		`-import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry';`
`4`	`3`
`5`		`-export const manifests: Array<ManifestTypes> = [`
	`4`	`+export const manifests: Array<UmbExtensionManifest> = [`
`6`	`5`	`{`
`7`	`6`	`name: 'Document Type Search Provider',`
`8`	`7`	`alias: UMB_DOCUMENT_TYPE_SEARCH_PROVIDER_ALIAS,`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,7 @@`
`1`	`1`	`import { UMB_DOCUMENT_ENTITY_TYPE } from '../entity.js';`
`2`	`2`	`import { UMB_DOCUMENT_SEARCH_PROVIDER_ALIAS } from './constants.js';`
`3`		`-import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry';`
`4`	`3`
`5`		`-export const manifests: Array<ManifestTypes> = [`
	`4`	`+export const manifests: Array<UmbExtensionManifest> = [`
`6`	`5`	`{`
`7`	`6`	`name: 'Document Search Provider',`
`8`	`7`	`alias: UMB_DOCUMENT_SEARCH_PROVIDER_ALIAS,`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`import { UMB_MEDIA_TYPE_ENTITY_TYPE } from '../entity.js';`
`2`		`-import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry';`
`3`	`2`
`4`		`-export const manifests: Array<ManifestTypes> = [`
	`3`	`+export const manifests: Array<UmbExtensionManifest> = [`
`5`	`4`	`{`
`6`	`5`	`name: 'Media Type Search Provider',`
`7`	`6`	`alias: 'Umb.SearchProvider.MediaType',`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`import { UMB_MEDIA_ENTITY_TYPE } from '../entity.js';`
`2`		`-import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry';`
`3`	`2`
`4`		`-export const manifests: Array<ManifestTypes> = [`
	`3`	`+export const manifests: Array<UmbExtensionManifest> = [`
`5`	`4`	`{`
`6`	`5`	`name: 'Media Search Provider',`
`7`	`6`	`alias: 'Umb.SearchProvider.Media',`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`import { UMB_MEMBER_TYPE_ENTITY_TYPE } from '../entity.js';`
`2`		`-import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry';`
`3`	`2`
`4`		`-export const manifests: Array<ManifestTypes> = [`
	`3`	`+export const manifests: Array<UmbExtensionManifest> = [`
`5`	`4`	`{`
`6`	`5`	`name: 'Member Type Search Provider',`
`7`	`6`	`alias: 'Umb.SearchProvider.MemberType',`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,7 @@`
`1`	`1`	`import { UMB_MEMBER_ENTITY_TYPE } from '../entity.js';`
`2`	`2`	`import { UMB_MEMBER_SEARCH_PROVIDER_ALIAS } from './constants.js';`
`3`		`-import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry';`
`4`	`3`
`5`		`-export const manifests: Array<ManifestTypes> = [`
	`4`	`+export const manifests: Array<UmbExtensionManifest> = [`
`6`	`5`	`{`
`7`	`6`	`name: 'Member Search Provider',`
`8`	`7`	`alias: UMB_MEMBER_SEARCH_PROVIDER_ALIAS,`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+export * from './search-provider.extension.js';`
	`2`	`+export * from './search-result-item.extension.js';`