Skip to content

Commit

Permalink
Merge branch 'main' into v15/feature/emm-health-check
Browse files Browse the repository at this point in the history
  • Loading branch information
madsrasmussen committed Sep 30, 2024
2 parents 995fe84 + 129e9ef commit 92e3244
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 14 deletions.
2 changes: 1 addition & 1 deletion src/packages/core/dashboard/dashboard.extension.ts
Original file line number Diff line number Diff line change
@@ -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
Expand Down
9 changes: 5 additions & 4 deletions src/packages/core/extension-registry/extensions/index.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
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-item-element.interface.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';
9 changes: 2 additions & 7 deletions src/packages/core/extension-registry/models/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import type { ManifestUserProfileApp } from './user-profile-app.model.js';
import type { ManifestGranularUserPermission } from './user-granular-permission.model.js';
import type { ManifestMfaLoginProvider } from './mfa-login-provider.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 './auth-provider.model.js';
Expand All @@ -20,10 +19,10 @@ export type * from './file-upload-preview.model.js';
export type * from './external-login-provider.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 './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 './mfa-login-provider.model.js';
export type * from './monaco-markdown-editor-action.model.js';
export type * from './tinymce-plugin.model.js';
export type * from './ufm-component.model.js';
export type * from './ufm-filter.model.js';
Expand All @@ -43,10 +42,6 @@ export type ManifestTypes =
| ManifestGranularUserPermission
| ManifestMfaLoginProvider
| ManifestMonacoMarkdownEditorAction
| ManifestPickerSearchResultItem
| ManifestMfaLoginProvider
| ManifestMonacoMarkdownEditorAction
| ManifestPickerSearchResultItem
| ManifestTinyMcePlugin
| ManifestUfmComponent
| ManifestUfmFilter
Expand Down
3 changes: 2 additions & 1 deletion src/packages/core/picker/search/index.ts
Original file line number Diff line number Diff line change
@@ -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';
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
1 change: 1 addition & 0 deletions src/packages/core/picker/search/result-item/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './picker-search-result-item.extension.js';
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,9 @@ export interface ManifestPickerSearchResultItem extends ManifestElementAndApi {
type: 'pickerSearchResultItem';
forEntityTypes: Array<string>;
}

declare global {
interface UmbExtensionManifestMap {
umbPickerSearchResultItem: ManifestPickerSearchResultItem;
}
}

0 comments on commit 92e3244

Please sign in to comment.