Skip to content

Commit f846856

Browse files
authored
Merge pull request #2284 from umbraco/v15/feature/emm-collection
Feature: Extension Manifest Map: Collection
2 parents 115e090 + fd13610 commit f846856

File tree

50 files changed

+398
-405
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+398
-405
lines changed

src/packages/block/block-custom-view/block-editor-custom-view.extension.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ export interface ManifestBlockEditorCustomView extends ManifestElement<UmbBlockE
2121

2222
declare global {
2323
interface UmbExtensionManifestMap {
24-
blockEditorCustomView: ManifestBlockEditorCustomView;
24+
umbBlockEditorCustomView: ManifestBlockEditorCustomView;
2525
}
2626
}

src/packages/core/collection/action/collection-action-button.element.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ import { html, customElement, property, state, ifDefined } from '@umbraco-cms/ba
44
import type { UUIButtonState } from '@umbraco-cms/backoffice/external/uui';
55
import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
66
import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
7-
import type { UmbBackofficeManifestKind, ManifestCollectionAction } from '@umbraco-cms/backoffice/extension-registry';
7+
import type { UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry';
8+
import type { ManifestCollectionAction } from '@umbraco-cms/backoffice/collection';
89
import { createExtensionApi } from '@umbraco-cms/backoffice/extension-api';
910

1011
const manifest: UmbBackofficeManifestKind = {

src/packages/core/collection/collection-view.manager.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { ManifestCollectionView } from '../extension-registry/models/index.js';
1+
import type { ManifestCollectionView } from './extensions/index.js';
22
import { umbExtensionsRegistry } from '../extension-registry/index.js';
33
import { UmbCollectionViewManager } from './collection-view.manager.js';
44
import { expect } from '@open-wc/testing';

src/packages/core/collection/collection-view.manager.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1+
import type { ManifestCollectionView } from './extensions/index.js';
12
import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api';
23
import { UmbExtensionsManifestInitializer, createExtensionElement } from '@umbraco-cms/backoffice/extension-api';
34
import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
45
import { UmbArrayState, UmbObjectState, UmbStringState } from '@umbraco-cms/backoffice/observable-api';
5-
import type { ManifestCollectionView } from '@umbraco-cms/backoffice/extension-registry';
66
import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
77
import type { UmbRoute } from '@umbraco-cms/backoffice/router';
88

src/packages/core/collection/collection.element.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type { UmbCollectionConfiguration } from './types.js';
2+
import type { ManifestCollection } from './extensions/index.js';
23
import { customElement, property } from '@umbraco-cms/backoffice/external/lit';
34
import { UmbExtensionElementAndApiSlotElementBase } from '@umbraco-cms/backoffice/extension-registry';
4-
import type { ManifestCollection } from '@umbraco-cms/backoffice/extension-registry';
55
import type { UmbApi } from '@umbraco-cms/backoffice/extension-api';
66

77
const elementName = 'umb-collection';

src/packages/core/collection/components/collection-view-bundle.element.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import type { UmbDefaultCollectionContext } from '../default/index.js';
22
import { UMB_COLLECTION_CONTEXT } from '../default/index.js';
33
import type { UmbCollectionLayoutConfiguration } from '../types.js';
4+
import type { ManifestCollectionView } from '../extensions/index.js';
45
import { css, html, customElement, state, nothing, repeat, query } from '@umbraco-cms/backoffice/external/lit';
56
import { observeMultiple } from '@umbraco-cms/backoffice/observable-api';
67
import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
78
import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
89
import { UMB_ENTITY_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/workspace';
9-
import type { ManifestCollectionView } from '@umbraco-cms/backoffice/extension-registry';
1010
import type { UUIPopoverContainerElement } from '@umbraco-cms/backoffice/external/uui';
1111

1212
interface UmbCollectionViewLayout {

src/packages/core/collection/default/collection-default.context.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,15 @@ import type {
88
} from '../types.js';
99
import type { UmbCollectionFilterModel } from '../collection-filter-model.interface.js';
1010
import type { UmbCollectionRepository } from '../repository/collection-repository.interface.js';
11+
import type { ManifestCollection } from '../extensions/index.js';
1112
import { UMB_COLLECTION_CONTEXT } from './collection-default.context-token.js';
1213
import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
1314
import { UmbArrayState, UmbNumberState, UmbObjectState } from '@umbraco-cms/backoffice/observable-api';
1415
import { UmbChangeEvent } from '@umbraco-cms/backoffice/event';
1516
import { UmbContextBase } from '@umbraco-cms/backoffice/class-api';
1617
import { UmbExtensionApiInitializer } from '@umbraco-cms/backoffice/extension-api';
1718
import { UmbSelectionManager, UmbPaginationManager } from '@umbraco-cms/backoffice/utils';
18-
import type { ManifestCollection, ManifestRepository } from '@umbraco-cms/backoffice/extension-registry';
19+
import type { ManifestRepository } from '@umbraco-cms/backoffice/extension-registry';
1920
import type { UmbApi } from '@umbraco-cms/backoffice/extension-api';
2021
import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
2122
import {

src/packages/core/extension-registry/models/collection-action.model.ts renamed to src/packages/core/collection/extensions/collection-action.extension.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,9 @@ export interface MetaCollectionAction {
1616
label: string;
1717
href?: string;
1818
}
19+
20+
declare global {
21+
interface UmbExtensionManifestMap {
22+
umbCollectionAction: ManifestCollectionAction;
23+
}
24+
}

src/packages/core/extension-registry/models/collection-view.model.ts renamed to src/packages/core/collection/extensions/collection-view.extension.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,9 @@ export interface ConditionsCollectionView {
3636
*/
3737
entityType: string;
3838
}
39+
40+
declare global {
41+
interface UmbExtensionManifestMap {
42+
umbCollectionView: ManifestCollectionView;
43+
}
44+
}

src/packages/core/extension-registry/models/collection.models.ts renamed to src/packages/core/collection/extensions/collection.extension.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,9 @@ export interface ManifestCollection
1010
export interface MetaCollection {
1111
repositoryAlias: string;
1212
}
13+
14+
declare global {
15+
interface UmbExtensionManifestMap {
16+
umbCollection: ManifestCollection;
17+
}
18+
}

0 commit comments

Comments
 (0)