diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/kinds/editable/editable-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/kinds/editable/editable-workspace.element.ts deleted file mode 100644 index 66b74b929d..0000000000 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/kinds/editable/editable-workspace.element.ts +++ /dev/null @@ -1,38 +0,0 @@ -import type { UmbSubmittableWorkspaceContext } from '../../contexts/tokens/submittable-workspace-context.interface.js'; -import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; -import { html, customElement, state, css } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; -import type { UmbRoute } from '@umbraco-cms/backoffice/router'; -import { UmbExtensionsApiInitializer } from '@umbraco-cms/backoffice/extension-api'; - -@customElement('umb-editable-workspace') -export class UmbEditableWorkspaceElement extends UmbLitElement { - @state() - _routes: UmbRoute[] = []; - - public set api(api: UmbSubmittableWorkspaceContext) { - this.observe(api.routes.routes, (routes) => (this._routes = routes)); - - new UmbExtensionsApiInitializer(this, umbExtensionsRegistry, 'workspaceContext', [api]); - } - - override render() { - return html` `; - } - - static override styles = [ - css` - form { - display: contents; - } - `, - ]; -} - -export default UmbEditableWorkspaceElement; - -declare global { - interface HTMLElementTagNameMap { - 'umb-editable-workspace': UmbEditableWorkspaceElement; - } -} diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/kinds/editable/editable-workspace.kind.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/kinds/editable/editable-workspace.kind.ts deleted file mode 100644 index 81ddb39fda..0000000000 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/kinds/editable/editable-workspace.kind.ts +++ /dev/null @@ -1,13 +0,0 @@ -import type { UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; - -export const manifest: UmbBackofficeManifestKind = { - type: 'kind', - alias: 'Umb.Kind.Workspace.Editable', - matchKind: 'editable', - matchType: 'workspace', - manifest: { - type: 'workspace', - kind: 'editable', - element: () => import('./editable-workspace.element.js'), - }, -}; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/kinds/editable/editable-workspace.test.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/kinds/editable/editable-workspace.test.ts deleted file mode 100644 index e0f2d541ca..0000000000 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/kinds/editable/editable-workspace.test.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { expect, fixture, html } from '@open-wc/testing'; -import { UmbEditableWorkspaceElement } from './editable-workspace.element.js'; -import { type UmbTestRunnerWindow, defaultA11yConfig } from '@umbraco-cms/internal/test-utils'; - -describe('UmbEditableWorkspaceElement', () => { - let element: UmbEditableWorkspaceElement; - - beforeEach(async () => { - element = await fixture(html``); - }); - - it('is defined with its own instance', () => { - expect(element).to.be.instanceOf(UmbEditableWorkspaceElement); - }); - - if ((window as UmbTestRunnerWindow).__UMBRACO_TEST_RUN_A11Y_TEST) { - it('passes the a11y audit', async () => { - // TODO: should we use shadowDom here? - await expect(element).to.be.accessible(defaultA11yConfig); - }); - } -}); 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 683007dc0b..b225a924a3 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 @@ -1,6 +1,3 @@ -import { UmbDataTypeDetailRepository } from '../repository/detail/data-type-detail.repository.js'; -import type { UmbDataTypeDetailModel, UmbDataTypePropertyModel } from '../types.js'; -import { UmbDataTypeWorkspaceEditorElement } from './data-type-workspace-editor.element.js'; import type { UmbPropertyDatasetContext } from '@umbraco-cms/backoffice/property'; import type { UmbInvariantDatasetWorkspaceContext, @@ -10,7 +7,6 @@ import { UmbSubmittableWorkspaceContextBase, UmbInvariantWorkspacePropertyDatasetContext, UmbWorkspaceIsNewRedirectController, - UmbWorkspaceRouteManager, } from '@umbraco-cms/backoffice/workspace'; import { appendToFrozenArray, @@ -29,7 +25,9 @@ import { UmbRequestReloadChildrenOfEntityEvent, UmbRequestReloadStructureForEntityEvent, } from '@umbraco-cms/backoffice/entity-action'; -import { UMB_PROPERTY_EDITOR_SCHEMA_ALIAS_DEFAULT } from '@umbraco-cms/backoffice/property-editor'; +import type { UmbDataTypeDetailModel, UmbDataTypePropertyModel } from '../types.js'; +import { UmbDataTypeDetailRepository } from '../repository/detail/data-type-detail.repository.js'; +import { UmbDataTypeWorkspaceEditorElement } from './data-type-workspace-editor.element.js'; type EntityType = UmbDataTypeDetailModel; export class UmbDataTypeWorkspaceContext diff --git a/src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/manifests.ts index d8887e858d..62232d9507 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/manifests.ts @@ -10,7 +10,7 @@ const DATA_TYPE_WORKSPACE_ALIAS = 'Umb.Workspace.DataType'; const workspace: ManifestWorkspaces = { type: 'workspace', - kind: 'editable', + kind: 'routable', alias: DATA_TYPE_WORKSPACE_ALIAS, name: 'Data Type Workspace', api: () => import('./data-type-workspace.context.js'),