yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into v15/feature/emm-property-editor

Browse Source 
# Conflicts:
#	src/packages/core/extension-registry/models/index.ts
This commit is contained in:
Niels Lyngsø
2024-09-29 19:57:47 +02:00
parent b8c43bbf6d 421e2b617f
commit c8b03a7ed8
5 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/index.ts
View File

@@ -29,7 +29,6 @@ import type { ManifestLocalization } from './localization.model.js';
import type { ManifestMenu } from './menu.model.js';
import type { ManifestMenuItem, ManifestMenuItemLinkKind, ManifestMenuItemTreeKind } from './menu-item.model.js';
import type { ManifestPreviewAppProvider } from './preview-app.model.js';
import type { ManifestPropertyAction, ManifestPropertyActionDefaultKind } from './property-action.model.js';
import type { ManifestRepository } from './repository.model.js';
import type { ManifestSection } from './section.model.js';
import type { ManifestSectionSidebarApp, ManifestSectionSidebarAppMenuKind } from './section-sidebar-app.model.js';
@@ -74,7 +73,6 @@ 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 './property-action.model.js';
export type * from './repository.model.js';
export type * from './section-sidebar-app.model.js';
export type * from './section-view.model.js';
@@ -103,8 +101,6 @@ export type ManifestEntityActions =
| ManifestEntityActionTrashKind
| ManifestEntityActionUpdateFolderKind;
export type ManifestPropertyActions = ManifestPropertyAction | ManifestPropertyActionDefaultKind;
export type ManifestTypes =
| ManifestAppEntryPoint
| ManifestAuthProvider
@@ -138,7 +134,6 @@ export type ManifestTypes =
| ManifestMonacoMarkdownEditorAction
| ManifestPickerSearchResultItem
| ManifestPreviewAppProvider
| ManifestPropertyActions
| ManifestRepository
| ManifestSection
| ManifestSectionRoute

2
src/Umbraco.Web.UI.Client/src/packages/core/property-action/components/property-action-menu/property-action-menu.element.ts
View File

@@ -1,7 +1,7 @@
import type { UmbPropertyActionArgs } from '../property-action/types.js';
import { css, customElement, html, nothing, property, repeat, state } from '@umbraco-cms/backoffice/external/lit';
import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
import type { ManifestPropertyAction, MetaPropertyAction } from '@umbraco-cms/backoffice/extension-registry';
import type { ManifestPropertyAction, MetaPropertyAction } from '@umbraco-cms/backoffice/property-action';
import { UmbExtensionsElementAndApiInitializer } from '@umbraco-cms/backoffice/extension-api';
import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
import { UmbTextStyles } from '@umbraco-cms/backoffice/style';

9
src/Umbraco.Web.UI.Client/src/packages/core/property-action/components/property-action/default/property-action.element.ts
View File

@@ -1,11 +1,12 @@
import type { UmbPropertyAction } from '../index.js';
import { UmbActionExecutedEvent } from '@umbraco-cms/backoffice/event';
import { html, customElement, property, state, ifDefined, nothing } from '@umbraco-cms/backoffice/external/lit';
import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
import type {
ManifestPropertyActionDefaultKind,
MetaPropertyActionDefaultKind,
} from '@umbraco-cms/backoffice/extension-registry';
} from '../../../extensions/property-action.extension.js';
import { UmbActionExecutedEvent } from '@umbraco-cms/backoffice/event';
import { html, customElement, property, state, ifDefined, nothing } from '@umbraco-cms/backoffice/external/lit';
import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
import type { UUIMenuItemEvent } from '@umbraco-cms/backoffice/external/uui';
@customElement('umb-property-action')

10
src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/property-action.model.ts → src/Umbraco.Web.UI.Client/src/packages/core/property-action/extensions/property-action.extension.ts
View File

@@ -1,4 +1,4 @@
import type { UmbPropertyAction } from '../../property-action/components/property-action/property-action.interface.js';
import type { UmbPropertyAction } from '../components/property-action/property-action.interface.js';
import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
import type { ManifestElementAndApi, ManifestWithDynamicConditions } from '@umbraco-cms/backoffice/extension-api';
@@ -39,3 +39,11 @@ export interface MetaPropertyActionDefaultKind extends MetaPropertyAction {
*/
label: string;
}
export type UmbPropertyActionExtensions = ManifestPropertyAction | ManifestPropertyActionDefaultKind;
declare global {
interface UmbExtensionManifestMap {
UmbPropertyActionExtensions: UmbPropertyActionExtensions;
}
}

1
src/Umbraco.Web.UI.Client/src/packages/core/property-action/index.ts
View File

@@ -1 +1,2 @@
export * from './components/index.js';
export * from './extensions/property-action.extension.js';