From dfcfd61c3d9025ac044fc8cc8ad44944150ea980 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Mon, 30 Sep 2024 10:12:41 +0200 Subject: [PATCH 1/4] move files --- src/packages/core/extension-registry/models/index.ts | 3 --- src/packages/core/picker/search/index.ts | 3 ++- src/packages/core/picker/search/result-item/index.ts | 1 + .../result-item/picker-search-result-item.extension.ts} | 6 ++++++ 4 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 src/packages/core/picker/search/result-item/index.ts rename src/packages/core/{extension-registry/models/picker-search-result-item.model.ts => picker/search/result-item/picker-search-result-item.extension.ts} (70%) diff --git a/src/packages/core/extension-registry/models/index.ts b/src/packages/core/extension-registry/models/index.ts index 67f58875e1..8a5d2de8aa 100644 --- a/src/packages/core/extension-registry/models/index.ts +++ b/src/packages/core/extension-registry/models/index.ts @@ -40,7 +40,6 @@ 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'; import type { ManifestMonacoMarkdownEditorAction } from './monaco-markdown-editor-action.model.js'; -import type { ManifestPickerSearchResultItem } from './picker-search-result-item.model.js'; import type { ManifestBase, ManifestBundle, ManifestCondition } from '@umbraco-cms/backoffice/extension-api'; export type * from './app-entry-point.model.js'; @@ -62,7 +61,6 @@ export type * from './menu-item.model.js'; export type * from './menu.model.js'; export type * from './mfa-login-provider.model.js'; export type * from './monaco-markdown-editor-action.model.js'; -export type * from './picker-search-result-item.model.js'; export type * from './preview-app.model.js'; export type * from './repository.model.js'; export type * from './store.model.js'; @@ -117,7 +115,6 @@ export type ManifestTypes = | ManifestMenuItemLinkKind | ManifestMfaLoginProvider | ManifestMonacoMarkdownEditorAction - | ManifestPickerSearchResultItem | ManifestPreviewAppProvider | ManifestRepository | ManifestStore diff --git a/src/packages/core/picker/search/index.ts b/src/packages/core/picker/search/index.ts index c943b37222..10582f4796 100644 --- a/src/packages/core/picker/search/index.ts +++ b/src/packages/core/picker/search/index.ts @@ -1,3 +1,4 @@ export * from './manager/index.js'; -export * from './picker-search-result.element.js'; export * from './picker-search-field.element.js'; +export * from './picker-search-result.element.js'; +export * from './result-item/index.js'; diff --git a/src/packages/core/picker/search/result-item/index.ts b/src/packages/core/picker/search/result-item/index.ts new file mode 100644 index 0000000000..ed25ab6d77 --- /dev/null +++ b/src/packages/core/picker/search/result-item/index.ts @@ -0,0 +1 @@ +export * from './picker-search-result-item.extension.js'; diff --git a/src/packages/core/extension-registry/models/picker-search-result-item.model.ts b/src/packages/core/picker/search/result-item/picker-search-result-item.extension.ts similarity index 70% rename from src/packages/core/extension-registry/models/picker-search-result-item.model.ts rename to src/packages/core/picker/search/result-item/picker-search-result-item.extension.ts index 8797323f40..f0bcf63e83 100644 --- a/src/packages/core/extension-registry/models/picker-search-result-item.model.ts +++ b/src/packages/core/picker/search/result-item/picker-search-result-item.extension.ts @@ -7,3 +7,9 @@ export interface ManifestPickerSearchResultItem extends ManifestElementAndApi { type: 'pickerSearchResultItem'; forEntityTypes: Array; } + +declare global { + interface UmbExtensionManifestMap { + umbPickerSearchResultItem: ManifestPickerSearchResultItem; + } +} From 50187f671f6cfb28aeb485a3766072be5b5f7950 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Mon, 30 Sep 2024 10:13:43 +0200 Subject: [PATCH 2/4] Update picker-search-result.element.ts --- src/packages/core/picker/search/picker-search-result.element.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/packages/core/picker/search/picker-search-result.element.ts b/src/packages/core/picker/search/picker-search-result.element.ts index 1b3a6411dc..7d5fd3b902 100644 --- a/src/packages/core/picker/search/picker-search-result.element.ts +++ b/src/packages/core/picker/search/picker-search-result.element.ts @@ -1,10 +1,10 @@ import { UMB_PICKER_CONTEXT } from '../picker.context.token.js'; import type { UmbPickerContext } from '../picker.context.js'; +import type { ManifestPickerSearchResultItem } from './result-item/picker-search-result-item.extension.js'; import { customElement, html, nothing, repeat, state } from '@umbraco-cms/backoffice/external/lit'; import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbSearchRequestArgs } from '@umbraco-cms/backoffice/search'; import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity'; -import type { ManifestPickerSearchResultItem } from '@umbraco-cms/backoffice/extension-registry'; const elementName = 'umb-picker-search-result'; @customElement(elementName) From 173fd835be5d102d779b6648dd3f3d3e36068360 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Mon, 30 Sep 2024 11:29:57 +0200 Subject: [PATCH 3/4] move menu item interface --- src/packages/core/extension-registry/extensions/index.ts | 9 +++++---- .../menu-item-element.interface.ts | 2 +- .../extension-registry/extensions/menu-item.extension.ts | 2 +- src/packages/core/extension-registry/interfaces/index.ts | 2 -- 4 files changed, 7 insertions(+), 8 deletions(-) rename src/packages/core/extension-registry/{interfaces => extensions}/menu-item-element.interface.ts (57%) diff --git a/src/packages/core/extension-registry/extensions/index.ts b/src/packages/core/extension-registry/extensions/index.ts index fd9f0fbd45..0ded934921 100644 --- a/src/packages/core/extension-registry/extensions/index.ts +++ b/src/packages/core/extension-registry/extensions/index.ts @@ -1,13 +1,14 @@ -export type * from './global-context.extension.js'; -export type * from './header-app.extension.js'; -export type * from './repository.extension.js'; export type * from './app-entry-point.extension.js'; -export type * from './entity-action.extension.js'; export type * from './backoffice-entry-point.extension.js'; +export type * from './entity-action.extension.js'; export type * from './entity-bulk-action.extension.js'; export type * from './entity-user-permission.extension.js'; export type * from './entry-point.extension.js'; +export type * from './global-context.extension.js'; +export type * from './header-app.extension.js'; +export type * from './menu-item-element.interface.js'; export type * from './menu-item.extension.js'; export type * from './menu.extension.js'; export type * from './preview-app.extension.js'; +export type * from './repository.extension.js'; export type * from './store.extension.js'; diff --git a/src/packages/core/extension-registry/interfaces/menu-item-element.interface.ts b/src/packages/core/extension-registry/extensions/menu-item-element.interface.ts similarity index 57% rename from src/packages/core/extension-registry/interfaces/menu-item-element.interface.ts rename to src/packages/core/extension-registry/extensions/menu-item-element.interface.ts index 5232e54fb1..b0b909fe40 100644 --- a/src/packages/core/extension-registry/interfaces/menu-item-element.interface.ts +++ b/src/packages/core/extension-registry/extensions/menu-item-element.interface.ts @@ -1,4 +1,4 @@ -import type { ManifestMenuItem } from '../models/index.js'; +import type { ManifestMenuItem } from './menu-item.extension.js'; export interface UmbMenuItemElement extends HTMLElement { manifest?: ManifestMenuItem; diff --git a/src/packages/core/extension-registry/extensions/menu-item.extension.ts b/src/packages/core/extension-registry/extensions/menu-item.extension.ts index 96f70bfd6a..811c645ba1 100644 --- a/src/packages/core/extension-registry/extensions/menu-item.extension.ts +++ b/src/packages/core/extension-registry/extensions/menu-item.extension.ts @@ -1,4 +1,4 @@ -import type { UmbMenuItemElement } from '../interfaces/menu-item-element.interface.js'; +import type { UmbMenuItemElement } from './menu-item-element.interface.js'; import type { ManifestWithDynamicConditions, ManifestElement } from '@umbraco-cms/backoffice/extension-api'; export interface ManifestMenuItem diff --git a/src/packages/core/extension-registry/interfaces/index.ts b/src/packages/core/extension-registry/interfaces/index.ts index f987a1cd4d..53756c0c15 100644 --- a/src/packages/core/extension-registry/interfaces/index.ts +++ b/src/packages/core/extension-registry/interfaces/index.ts @@ -1,4 +1,2 @@ -export * from '../../dashboard/dashboard-element.interface.js'; export * from './external-login-provider-element.interface.js'; export * from './file-upload-preview.interface.js'; -export * from './menu-item-element.interface.js'; From f4826c722bb397a1f08d16cda4b9961ae9a3d68d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Mon, 30 Sep 2024 11:30:52 +0200 Subject: [PATCH 4/4] move dashboard interface import --- src/packages/core/dashboard/dashboard.extension.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/packages/core/dashboard/dashboard.extension.ts b/src/packages/core/dashboard/dashboard.extension.ts index 0797d89a77..86ab5f5009 100644 --- a/src/packages/core/dashboard/dashboard.extension.ts +++ b/src/packages/core/dashboard/dashboard.extension.ts @@ -1,4 +1,4 @@ -import type { UmbDashboardElement } from '../extension-registry/interfaces/index.js'; +import type { UmbDashboardElement } from './dashboard-element.interface.js'; import type { ManifestElement, ManifestWithDynamicConditions } from '@umbraco-cms/backoffice/extension-api'; export interface ManifestDashboard