From 04667635d811ec001fda2afcc8c868b4f08f3e0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Tue, 2 Apr 2024 10:53:20 +0200 Subject: [PATCH] rename editable kind --- .../packages/core/extension-registry/models/index.ts | 6 +----- .../core/extension-registry/models/workspace.model.ts | 8 -------- .../contexts/submittable-workspace-context-base.ts | 1 + .../tokens/editable-workspace-context.interface.ts | 3 --- .../tokens/editable-workspace.context-token.ts | 10 ---------- .../data-type/workspace/data-type-workspace.context.ts | 3 +-- 6 files changed, 3 insertions(+), 28 deletions(-) delete mode 100644 src/Umbraco.Web.UI.Client/src/packages/core/workspace/contexts/tokens/editable-workspace-context.interface.ts delete mode 100644 src/Umbraco.Web.UI.Client/src/packages/core/workspace/contexts/tokens/editable-workspace.context-token.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/index.ts index 9f037f1529..b9b099fc50 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/index.ts @@ -39,11 +39,7 @@ import type { ManifestLocalization } from './localization.model.js'; import type { ManifestTree } from './tree.model.js'; import type { ManifestTreeItem } from './tree-item.model.js'; import type { ManifestUserProfileApp } from './user-profile-app.model.js'; -import type { - ManifestWorkspace, - ManifestWorkspaceRoutableKind, - ManifestWorkspaceEditableKind, -} from './workspace.model.js'; +import type { ManifestWorkspace, ManifestWorkspaceRoutableKind } from './workspace.model.js'; import type { ManifestWorkspaceAction, ManifestWorkspaceActionDefaultKind } from './workspace-action.model.js'; import type { ManifestWorkspaceActionMenuItem } from './workspace-action-menu-item.model.js'; import type { ManifestWorkspaceContext } from './workspace-context.model.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/workspace.model.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/workspace.model.ts index fb02a64fb9..ae4219d2d5 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/workspace.model.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/workspace.model.ts @@ -25,11 +25,3 @@ export interface ManifestWorkspaceRoutableKind } export interface MetaWorkspaceRoutableKind extends MetaWorkspace {} - -export interface ManifestWorkspaceEditableKind - extends ManifestWorkspace { - type: 'workspace'; - kind: 'routable'; -} - -export interface MetaWorkspaceEditableKind extends MetaWorkspace {} diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/contexts/submittable-workspace-context-base.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/contexts/submittable-workspace-context-base.ts index 73eb41a6e0..dcc8dae80e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/contexts/submittable-workspace-context-base.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/contexts/submittable-workspace-context-base.ts @@ -129,6 +129,7 @@ export abstract class UmbSubmittableWorkspaceContextBase /* * @deprecated Use UmbSubmittableWorkspaceContextBase instead — Will be removed before RC. + * Rename `save` to `submit` and return a promise that resolves to true when save is complete. * TODO: Delete before RC. */ export abstract class UmbEditableWorkspaceContextBase< diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/contexts/tokens/editable-workspace-context.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/contexts/tokens/editable-workspace-context.interface.ts deleted file mode 100644 index 61323bf654..0000000000 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/contexts/tokens/editable-workspace-context.interface.ts +++ /dev/null @@ -1,3 +0,0 @@ -import type { UmbRoutableWorkspaceContext } from '../../index.js'; - -export interface UmbEditableWorkspaceContext extends UmbRoutableWorkspaceContext {} diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/contexts/tokens/editable-workspace.context-token.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/contexts/tokens/editable-workspace.context-token.ts deleted file mode 100644 index 78052357bb..0000000000 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/contexts/tokens/editable-workspace.context-token.ts +++ /dev/null @@ -1,10 +0,0 @@ -import type { UmbEditableWorkspaceContext } from './editable-workspace-context.interface.js'; -import type { UmbWorkspaceContext } from './workspace-context.interface.js'; -import { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; - -export const UMB_EDITABLE_WORKSPACE_CONTEXT = new UmbContextToken( - 'UmbWorkspaceContext', - undefined, - // TODO: Make proper discriminator: - (context): context is UmbEditableWorkspaceContext => 'routes' in context, -); diff --git a/src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/data-type-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/data-type-workspace.context.ts index c0b62b25c6..22eb89b335 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/data-type-workspace.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/data-type-workspace.context.ts @@ -5,7 +5,6 @@ import type { UmbPropertyDatasetContext } from '@umbraco-cms/backoffice/property import type { UmbInvariantDatasetWorkspaceContext, UmbRoutableWorkspaceContext, - UmbEditableWorkspaceContext, } from '@umbraco-cms/backoffice/workspace'; import { UmbSubmittableWorkspaceContextBase, @@ -34,7 +33,7 @@ import { UmbRequestReloadStructureForEntityEvent } from '@umbraco-cms/backoffice type EntityType = UmbDataTypeDetailModel; export class UmbDataTypeWorkspaceContext extends UmbSubmittableWorkspaceContextBase - implements UmbInvariantDatasetWorkspaceContext, UmbRoutableWorkspaceContext, UmbEditableWorkspaceContext + implements UmbInvariantDatasetWorkspaceContext, UmbRoutableWorkspaceContext { // public readonly repository: UmbDataTypeDetailRepository = new UmbDataTypeDetailRepository(this);