From e6d0c60ed0362d77fb8e2f7f0b678854ae24cfae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Fri, 22 Mar 2024 08:41:12 +0100 Subject: [PATCH] rename collection workspace interface --- .../tokens/workspace-collection-context.interface.ts | 10 +++++++++- .../tokens/workspace-collection-context.token.ts | 8 ++++---- .../documents/workspace/document-workspace.context.ts | 4 ++-- .../media/media/workspace/media-workspace.context.ts | 4 ++-- 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/contexts/tokens/workspace-collection-context.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/contexts/tokens/workspace-collection-context.interface.ts index e60933172a..e42888046b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/contexts/tokens/workspace-collection-context.interface.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/contexts/tokens/workspace-collection-context.interface.ts @@ -2,9 +2,17 @@ import type { UmbWorkspaceContextInterface } from './workspace-context.interface import type { Observable } from '@umbraco-cms/backoffice/external/rxjs'; import type { UmbContentTypeModel, UmbContentTypeStructureManager } from '@umbraco-cms/backoffice/content-type'; -export interface UmbWorkspaceCollectionContextInterface +export interface UmbCollectionWorkspaceContextInterface extends UmbWorkspaceContextInterface { contentTypeHasCollection: Observable; getCollectionAlias(): string; structure: UmbContentTypeStructureManager; } + +/** + * @deprecated Use UmbCollectionWorkspaceContextInterface instead — Will be removed before RC. + * TODO: Delete before RC. + */ +export interface UmbWorkspaceCollectionContextInterface + extends UmbCollectionWorkspaceContextInterface + diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/contexts/tokens/workspace-collection-context.token.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/contexts/tokens/workspace-collection-context.token.ts index 4cc4ba1460..b52145e403 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/contexts/tokens/workspace-collection-context.token.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/contexts/tokens/workspace-collection-context.token.ts @@ -2,15 +2,15 @@ import { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; import type { UmbContentTypeModel } from '@umbraco-cms/backoffice/content-type'; import type { UmbWorkspaceContextInterface, - UmbWorkspaceCollectionContextInterface, + UmbCollectionWorkspaceContextInterface, } from '@umbraco-cms/backoffice/workspace'; export const UMB_WORKSPACE_COLLECTION_CONTEXT = new UmbContextToken< UmbWorkspaceContextInterface, - UmbWorkspaceCollectionContextInterface + UmbCollectionWorkspaceContextInterface >( 'UmbWorkspaceContext', undefined, - (context): context is UmbWorkspaceCollectionContextInterface => - (context as UmbWorkspaceCollectionContextInterface).contentTypeHasCollection !== undefined, + (context): context is UmbCollectionWorkspaceContextInterface => + (context as UmbCollectionWorkspaceContextInterface).contentTypeHasCollection !== undefined, ); diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace.context.ts index 61d28a3b43..abb330b1b5 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace.context.ts @@ -28,7 +28,7 @@ import { UmbWorkspaceSplitViewManager, } from '@umbraco-cms/backoffice/workspace'; import type { - UmbWorkspaceCollectionContextInterface, + UmbCollectionWorkspaceContextInterface, UmbVariantDatasetWorkspaceContextInterface, UmbPublishableWorkspaceContextInterface, UmbRoutableWorkspaceContext, @@ -56,7 +56,7 @@ export class UmbDocumentWorkspaceContext UmbRoutableWorkspaceContext, UmbVariantDatasetWorkspaceContextInterface, UmbPublishableWorkspaceContextInterface, - UmbWorkspaceCollectionContextInterface + UmbCollectionWorkspaceContextInterface { public readonly repository = new UmbDocumentDetailRepository(this); public readonly publishingRepository = new UmbDocumentPublishingRepository(this); diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/media-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/media-workspace.context.ts index a00622e98f..86fedb04a4 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/media-workspace.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/media-workspace.context.ts @@ -6,7 +6,7 @@ import type { UmbMediaDetailModel, UmbMediaVariantModel, UmbMediaVariantOptionMo import { UMB_INVARIANT_CULTURE, UmbVariantId } from '@umbraco-cms/backoffice/variant'; import { UmbContentTypeStructureManager } from '@umbraco-cms/backoffice/content-type'; import type { - UmbWorkspaceCollectionContextInterface, + UmbCollectionWorkspaceContextInterface, UmbVariantDatasetWorkspaceContextInterface, } from '@umbraco-cms/backoffice/workspace'; import { @@ -36,7 +36,7 @@ export class UmbMediaWorkspaceContext extends UmbSaveableWorkspaceContextBase implements UmbVariantDatasetWorkspaceContextInterface, - UmbWorkspaceCollectionContextInterface + UmbCollectionWorkspaceContextInterface { // public readonly repository = new UmbMediaDetailRepository(this);