From c96293787b297a789a693cdccf7eeaf81fc258f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Wed, 21 Dec 2022 14:44:13 +0100 Subject: [PATCH] collection layout -> collection view --- .../collection/collection-toolbar.element.ts | 8 ++++---- .../collection/collection-view-media.element.ts | 8 ++++---- .../components/collection/layouts/manifests.ts | 4 ++-- .../extensions-api/registry/extension.registry.ts | 4 ++-- .../extensions-registry/collection-layout.models.ts | 13 ------------- .../extensions-registry/collection-view.models.ts | 13 +++++++++++++ .../src/core/extensions-registry/models.ts | 10 +++++----- 7 files changed, 30 insertions(+), 30 deletions(-) delete mode 100644 src/Umbraco.Web.UI.Client/src/core/extensions-registry/collection-layout.models.ts create mode 100644 src/Umbraco.Web.UI.Client/src/core/extensions-registry/collection-view.models.ts diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/components/collection/collection-toolbar.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/components/collection/collection-toolbar.element.ts index 5bbe42e9a6..d981648444 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/components/collection/collection-toolbar.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/components/collection/collection-toolbar.element.ts @@ -5,7 +5,7 @@ import { map } from 'rxjs'; import { TooltipMenuItem } from '../tooltip-menu'; import '../tooltip-menu/tooltip-menu.element'; import { UmbObserverMixin } from '@umbraco-cms/observable-api'; -import type { ManifestCollectionLayout } from '@umbraco-cms/models'; +import type { ManifestCollectionView } from '@umbraco-cms/models'; import { umbExtensionsRegistry } from '@umbraco-cms/extensions-registry'; @customElement('umb-collection-toolbar') @@ -53,10 +53,10 @@ export class UmbCollectionToolbarElement extends UmbObserverMixin(LitElement) { public useSearch = true; @state() - private _layouts: Array = []; + private _layouts: Array = []; @state() - private _currentLayout?: ManifestCollectionLayout; + private _currentLayout?: ManifestCollectionView; @state() private _search = ''; @@ -71,7 +71,7 @@ export class UmbCollectionToolbarElement extends UmbObserverMixin(LitElement) { } private _observeCollectionLayouts() { - this.observe>( + this.observe>( umbExtensionsRegistry?.extensionsOfType('collectionLayout').pipe( map((extensions) => { return extensions.filter((extension) => extension.meta.entityType === 'media'); diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/components/collection/collection-view-media.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/components/collection/collection-view-media.element.ts index dff98c4e57..4b05324a29 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/components/collection/collection-view-media.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/components/collection/collection-view-media.element.ts @@ -7,7 +7,7 @@ import '../../components/collection/collection-toolbar.element'; import '../../components/collection/collection-view.element'; import { IRoutingInfo } from 'router-slot'; import { createExtensionElement } from '@umbraco-cms/extensions-api'; -import type { ManifestCollectionLayout } from '@umbraco-cms/models'; +import type { ManifestCollectionView } from '@umbraco-cms/models'; import { UmbObserverMixin } from '@umbraco-cms/observable-api'; import { umbExtensionsRegistry } from '@umbraco-cms/extensions-registry'; import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; @@ -32,7 +32,7 @@ export class UmbCollectionViewMediaElement extends UmbContextConsumerMixin(UmbOb private _routes: Array = []; @state() - private _collectionViews: Array = []; + private _collectionViews: Array = []; @state() private _currentLayoutPathName = ''; @@ -61,7 +61,7 @@ export class UmbCollectionViewMediaElement extends UmbContextConsumerMixin(UmbOb } private _observeCollectionLayouts() { - this.observe>( + this.observe>( umbExtensionsRegistry?.extensionsOfType('collectionLayout').pipe( map((extensions) => { return extensions.filter((extension) => extension.meta.entityType === 'media'); @@ -82,7 +82,7 @@ export class UmbCollectionViewMediaElement extends UmbContextConsumerMixin(UmbOb return { path: `${layout.meta.pathName}`, component: () => createExtensionElement(layout), - setup: (_element: ManifestCollectionLayout, info: IRoutingInfo) => { + setup: (_element: ManifestCollectionView, info: IRoutingInfo) => { this._currentLayoutPathName = info.match.route.path; }, }; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/components/collection/layouts/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/components/collection/layouts/manifests.ts index 6a961436b1..df2d602eac 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/components/collection/layouts/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/components/collection/layouts/manifests.ts @@ -1,6 +1,6 @@ -import type { ManifestCollectionLayout } from '@umbraco-cms/models'; +import type { ManifestCollectionView } from '@umbraco-cms/models'; -export const manifests: Array = [ +export const manifests: Array = [ { type: 'collectionLayout', alias: 'Umb.CollectionLayout.Grid', diff --git a/src/Umbraco.Web.UI.Client/src/core/extensions-api/registry/extension.registry.ts b/src/Umbraco.Web.UI.Client/src/core/extensions-api/registry/extension.registry.ts index 0630f7d581..2e52683bad 100644 --- a/src/Umbraco.Web.UI.Client/src/core/extensions-api/registry/extension.registry.ts +++ b/src/Umbraco.Web.UI.Client/src/core/extensions-api/registry/extension.registry.ts @@ -17,7 +17,7 @@ import type { ManifestPackageView, ManifestExternalLoginProvider, ManifestHeaderApp, - ManifestCollectionLayout, + ManifestCollectionView, ManifestCollectionBulkAction, } from '../../models'; import { createExtensionElement } from '../create-extension-element.function'; @@ -86,7 +86,7 @@ export class UmbExtensionRegistry { extensionsOfType(type: 'entrypoint'): Observable>; extensionsOfType(type: 'custom'): Observable>; extensionsOfType(type: 'externalLoginProvider'): Observable>; - extensionsOfType(type: 'collectionLayout'): Observable>; + extensionsOfType(type: 'collectionLayout'): Observable>; extensionsOfType(type: 'collectionBulkAction'): Observable>; extensionsOfType(type: string): Observable>; extensionsOfType(type: string): Observable> { diff --git a/src/Umbraco.Web.UI.Client/src/core/extensions-registry/collection-layout.models.ts b/src/Umbraco.Web.UI.Client/src/core/extensions-registry/collection-layout.models.ts deleted file mode 100644 index 39c7f72d08..0000000000 --- a/src/Umbraco.Web.UI.Client/src/core/extensions-registry/collection-layout.models.ts +++ /dev/null @@ -1,13 +0,0 @@ -import type { ManifestElement } from './models'; - -export interface ManifestCollectionLayout extends ManifestElement { - type: 'collectionLayout'; - meta: MetaCollectionLayout; -} - -export interface MetaCollectionLayout { - label: string; - icon: string; - entityType: string; - pathName: string; -} diff --git a/src/Umbraco.Web.UI.Client/src/core/extensions-registry/collection-view.models.ts b/src/Umbraco.Web.UI.Client/src/core/extensions-registry/collection-view.models.ts new file mode 100644 index 0000000000..7a5770e3fd --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/core/extensions-registry/collection-view.models.ts @@ -0,0 +1,13 @@ +import type { ManifestElement } from './models'; + +export interface ManifestCollectionView extends ManifestElement { + type: 'collectionView'; + meta: MetaCollectionView; +} + +export interface MetaCollectionView { + label: string; + icon: string; + entityType: string; + pathName: string; +} diff --git a/src/Umbraco.Web.UI.Client/src/core/extensions-registry/models.ts b/src/Umbraco.Web.UI.Client/src/core/extensions-registry/models.ts index ced1e140fe..8eb1f754fd 100644 --- a/src/Umbraco.Web.UI.Client/src/core/extensions-registry/models.ts +++ b/src/Umbraco.Web.UI.Client/src/core/extensions-registry/models.ts @@ -13,7 +13,7 @@ import type { ManifestPropertyAction } from './property-action.models'; import type { ManifestPackageView } from './package-view.models'; import type { ManifestExternalLoginProvider } from './external-login-provider.models'; import type { ManifestCollectionBulkAction } from './collection-bulk-action.models'; -import type { ManifestCollectionLayout } from './collection-layout.models'; +import type { ManifestCollectionView } from './collection-view.models'; export * from './header-app.models'; export * from './section.models'; @@ -30,7 +30,7 @@ export * from './property-action.models'; export * from './package-view.models'; export * from './external-login-provider.models'; export * from './collection-bulk-action.models'; -export * from './collection-layout.models'; +export * from './collection-view.models'; export type ManifestTypes = | ManifestHeaderApp @@ -51,7 +51,7 @@ export type ManifestTypes = | ManifestEntrypoint | ManifestCustom | ManifestCollectionBulkAction - | ManifestCollectionLayout; + | ManifestCollectionView; export type ManifestStandardTypes = | 'headerApp' @@ -71,7 +71,7 @@ export type ManifestStandardTypes = | 'entrypoint' | 'externalLoginProvider' | 'collectionBulkAction' - | 'collectionLayout'; + | 'collectionView'; export type ManifestElementType = | ManifestSection @@ -88,7 +88,7 @@ export type ManifestElementType = | ManifestPackageView | ManifestExternalLoginProvider | ManifestCollectionBulkAction - | ManifestCollectionLayout; + | ManifestCollectionView; export interface ManifestBase { type: string;