diff --git a/src/Umbraco.Web.UI.Client/.storybook/main.js b/src/Umbraco.Web.UI.Client/.storybook/main.js index f1ec162c32..23de765208 100644 --- a/src/Umbraco.Web.UI.Client/.storybook/main.js +++ b/src/Umbraco.Web.UI.Client/.storybook/main.js @@ -2,7 +2,7 @@ const tsconfigPaths = require('vite-tsconfig-paths').default; const { mergeConfig } = require('vite'); module.exports = { - stories: ['../src/**/*.stories.@(js|jsx|ts|tsx|mdx)', '../libs/**/*.stories.@(js|jsx|ts|tsx|mdx)'], + stories: ['../src/**/*.stories.mdx', '../src/**/*.stories.@(js|jsx|ts|tsx)'], addons: ['@storybook/addon-links', '@storybook/addon-essentials', '@storybook/addon-a11y'], framework: '@storybook/web-components', features: { diff --git a/src/Umbraco.Web.UI.Client/.storybook/preview.js b/src/Umbraco.Web.UI.Client/.storybook/preview.js index d75579fb05..9eb279f45b 100644 --- a/src/Umbraco.Web.UI.Client/.storybook/preview.js +++ b/src/Umbraco.Web.UI.Client/.storybook/preview.js @@ -14,7 +14,7 @@ import { setCustomElements } from '@storybook/web-components'; import customElementManifests from '../custom-elements.json'; import { STORE_ALIAS as dataTypeAlias, UmbDataTypeStore } from '../src/backoffice/settings/data-types/data-type.store'; import { UmbDocumentTypeStore } from '../src/backoffice/documents/document-types/document-type.store'; -import { UmbIconStore } from '../libs/store/icon/icon.store'; +import { UmbIconStore } from '../src/core/stores/icon/icon.store'; import { onUnhandledRequest } from '../src/core/mocks/browser'; import { handlers } from '../src/core/mocks/browser-handlers'; import { LitElement } from 'lit'; @@ -22,9 +22,9 @@ import { UmbModalService } from '../src/core/modal'; // TODO: Fix storybook manifest registrations. -import { umbExtensionsRegistry } from '../libs/extensions-registry'; +import { umbExtensionsRegistry } from '../src/core/extensions-registry'; -import '../libs/context-api/provide/context-provider.element'; +import '../src/core/context-api/provide/context-provider.element'; import '../src/backoffice/shared/components/backoffice-frame/backoffice-modal-container.element'; import '../src/backoffice/shared/components/code-block/code-block.element'; diff --git a/src/Umbraco.Web.UI.Client/devops/plop/templates/property-editor-ui/element.ts.hbs b/src/Umbraco.Web.UI.Client/devops/plop/templates/property-editor-ui/element.ts.hbs index 8d0a63ef18..304216e13f 100644 --- a/src/Umbraco.Web.UI.Client/devops/plop/templates/property-editor-ui/element.ts.hbs +++ b/src/Umbraco.Web.UI.Client/devops/plop/templates/property-editor-ui/element.ts.hbs @@ -1,13 +1,30 @@ -import { html } from 'lit'; import { customElement, property } from 'lit/decorators.js'; import { UUITextStyles } from -'@umbraco-ui/uui-css/lib'; import { UmbLitElement } from '@umbraco-cms/context-api'; /** * @element -{{extensionTagName extensionType name}} -*/ @customElement('{{extensionTagName extensionType name}}') export class -{{className extensionType name}} -extends UmbLitElement { static styles = [UUITextStyles]; @property() value = ''; @property({ type: Array, attribute: -false }) public config = []; render() { return html`
{{extensionTagName extensionType name}}
`; } } export -default -{{className extensionType name}}; declare global { interface HTMLElementTagNameMap { '{{extensionTagName - extensionType - name -}}': -{{className extensionType name}}; } } +import { html } from 'lit'; +import { customElement, property } from 'lit/decorators.js'; +import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; +import { UmbLitElement } from '@umbraco-cms/element'; + +/** + * @element {{ extensionTagName extensionType name }} + */ +@customElement('{{ extensionTagName extensionType name }}') +export class {{className extensionType name }} extends UmbLitElement { + static styles = [UUITextStyles]; + + @property() + value = ''; + + @property({ type: Array, attribute: false }) + public config = []; + + render() { + return html`
{{ extensionTagName extensionType name }}
`; + } +} + +export default {{className extensionType name}}; + +declare global { + interface HTMLElementTagNameMap { + '{{extensionTagName extensionType name }}': {{className extensionType name}}; + } +} diff --git a/src/Umbraco.Web.UI.Client/libs/backend-api/package.json b/src/Umbraco.Web.UI.Client/libs/backend-api/package.json new file mode 100644 index 0000000000..25b096f57b --- /dev/null +++ b/src/Umbraco.Web.UI.Client/libs/backend-api/package.json @@ -0,0 +1,16 @@ +{ + "name": "@umbraco-cms/backend-api", + "version": "0.0.0", + "description": "", + "module": "dist/index.js", + "type": "module", + "files": [ + "dist" + ], + "scripts": { + "build": "rollup -c", + "test": "echo \"Error: no test specified\" && exit 1" + }, + "author": "Umbraco HQ", + "license": "MIT" +} diff --git a/src/Umbraco.Web.UI.Client/libs/context-api/index.ts b/src/Umbraco.Web.UI.Client/libs/context-api/index.ts index 35d7663dbd..083215832d 100644 --- a/src/Umbraco.Web.UI.Client/libs/context-api/index.ts +++ b/src/Umbraco.Web.UI.Client/libs/context-api/index.ts @@ -6,4 +6,3 @@ export * from './provide/context-provider'; export * from './provide/context-provide.event'; export * from './provide/context-provider.element'; export * from './context-token'; -export * from './element'; diff --git a/src/Umbraco.Web.UI.Client/libs/context-api/package.json b/src/Umbraco.Web.UI.Client/libs/context-api/package.json new file mode 100644 index 0000000000..1e5e8432db --- /dev/null +++ b/src/Umbraco.Web.UI.Client/libs/context-api/package.json @@ -0,0 +1,20 @@ +{ + "name": "@umbraco-cms/context-api", + "version": "0.0.0", + "description": "", + "module": "dist/index.js", + "type": "module", + "files": [ + "dist" + ], + "scripts": { + "build": "rollup -c", + "test": "echo \"Error: no test specified\" && exit 1" + }, + "dependencies": { + "lit": "^2.6.1", + "@umbraco-cms/element": "^0.0.0" + }, + "author": "Umbraco HQ", + "license": "MIT" +} diff --git a/src/Umbraco.Web.UI.Client/libs/context-api/provide/context-provider.element.test.ts b/src/Umbraco.Web.UI.Client/libs/context-api/provide/context-provider.element.test.ts index a4952a9631..b2f6c44311 100644 --- a/src/Umbraco.Web.UI.Client/libs/context-api/provide/context-provider.element.test.ts +++ b/src/Umbraco.Web.UI.Client/libs/context-api/provide/context-provider.element.test.ts @@ -1,7 +1,7 @@ import { expect, fixture, html } from '@open-wc/testing'; import { customElement } from 'lit/decorators.js'; import { UmbContextProviderElement } from './context-provider.element'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; @customElement('umb-context-test') export class ContextTestElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/libs/context-api/provide/context-provider.element.ts b/src/Umbraco.Web.UI.Client/libs/context-api/provide/context-provider.element.ts index b063129aac..cf8d3da2c1 100644 --- a/src/Umbraco.Web.UI.Client/libs/context-api/provide/context-provider.element.ts +++ b/src/Umbraco.Web.UI.Client/libs/context-api/provide/context-provider.element.ts @@ -1,6 +1,6 @@ import { html } from 'lit'; import { customElement, property } from 'lit/decorators.js'; -import { UmbLitElement } from '../element'; +import { UmbLitElement } from '@umbraco-cms/element'; @customElement('umb-context-provider') export class UmbContextProviderElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/libs/controller/package.json b/src/Umbraco.Web.UI.Client/libs/controller/package.json new file mode 100644 index 0000000000..4690cedd87 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/libs/controller/package.json @@ -0,0 +1,16 @@ +{ + "name": "@umbraco-cms/controller", + "version": "0.0.0", + "description": "", + "module": "dist/index.js", + "type": "module", + "files": [ + "dist" + ], + "scripts": { + "build": "rollup -c", + "test": "echo \"Error: no test specified\" && exit 1" + }, + "author": "Umbraco HQ", + "license": "MIT" +} diff --git a/src/Umbraco.Web.UI.Client/libs/context-api/element/element.mixin.ts b/src/Umbraco.Web.UI.Client/libs/element/element.mixin.ts similarity index 92% rename from src/Umbraco.Web.UI.Client/libs/context-api/element/element.mixin.ts rename to src/Umbraco.Web.UI.Client/libs/element/element.mixin.ts index 7ff62d598d..39748f9f26 100644 --- a/src/Umbraco.Web.UI.Client/libs/context-api/element/element.mixin.ts +++ b/src/Umbraco.Web.UI.Client/libs/element/element.mixin.ts @@ -1,11 +1,14 @@ import { Observable } from 'rxjs'; -import type { UmbContextToken } from '../context-token'; -import { UmbContextProviderController } from '../provide/context-provider.controller'; -import type { UmbContextCallback } from '../consume/context-request.event'; -import { UmbContextConsumerController } from '../consume/context-consumer.controller'; import type { HTMLElementConstructor } from '@umbraco-cms/models'; + import { UmbControllerHostInterface, UmbControllerHostMixin } from '@umbraco-cms/controller'; +import { + UmbContextToken, + UmbContextCallback, + UmbContextConsumerController, + UmbContextProviderController, +} from '@umbraco-cms/context-api'; import { UmbObserverController } from '@umbraco-cms/observable-api'; // TODO: can we use this aliases to generate the key of this type diff --git a/src/Umbraco.Web.UI.Client/libs/context-api/element/index.ts b/src/Umbraco.Web.UI.Client/libs/element/index.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/libs/context-api/element/index.ts rename to src/Umbraco.Web.UI.Client/libs/element/index.ts diff --git a/src/Umbraco.Web.UI.Client/libs/context-api/element/lit-element.element.ts b/src/Umbraco.Web.UI.Client/libs/element/lit-element.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/libs/context-api/element/lit-element.element.ts rename to src/Umbraco.Web.UI.Client/libs/element/lit-element.element.ts diff --git a/src/Umbraco.Web.UI.Client/libs/element/package.json b/src/Umbraco.Web.UI.Client/libs/element/package.json new file mode 100644 index 0000000000..f730e3eaa7 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/libs/element/package.json @@ -0,0 +1,16 @@ +{ + "name": "@umbraco-cms/element", + "version": "0.0.0", + "description": "", + "module": "dist/index.js", + "type": "module", + "files": [ + "dist" + ], + "scripts": { + "build": "rollup -c", + "test": "echo \"Error: no test specified\" && exit 1" + }, + "author": "Umbraco HQ", + "license": "MIT" +} diff --git a/src/Umbraco.Web.UI.Client/libs/element/rollup.config.js b/src/Umbraco.Web.UI.Client/libs/element/rollup.config.js new file mode 100644 index 0000000000..945c0afe88 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/libs/element/rollup.config.js @@ -0,0 +1,4 @@ +import config from '../../utils/rollup.config.js'; +export default { + ...config, +}; diff --git a/src/Umbraco.Web.UI.Client/libs/extensions-api/package.json b/src/Umbraco.Web.UI.Client/libs/extensions-api/package.json new file mode 100644 index 0000000000..7bc3418edc --- /dev/null +++ b/src/Umbraco.Web.UI.Client/libs/extensions-api/package.json @@ -0,0 +1,16 @@ +{ + "name": "@umbraco-cms/extensions-api", + "version": "0.0.0", + "description": "", + "module": "dist/index.js", + "type": "module", + "files": [ + "dist" + ], + "scripts": { + "build": "rollup -c", + "test": "echo \"Error: no test specified\" && exit 1" + }, + "author": "Umbraco HQ", + "license": "MIT" +} diff --git a/src/Umbraco.Web.UI.Client/libs/extensions-registry/package.json b/src/Umbraco.Web.UI.Client/libs/extensions-registry/package.json new file mode 100644 index 0000000000..6c83f4e1b4 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/libs/extensions-registry/package.json @@ -0,0 +1,16 @@ +{ + "name": "@umbraco-cms/extensions-registry", + "version": "0.0.0", + "description": "", + "module": "dist/index.js", + "type": "module", + "files": [ + "dist" + ], + "scripts": { + "build": "rollup -c", + "test": "echo \"Error: no test specified\" && exit 1" + }, + "author": "Umbraco HQ", + "license": "MIT" +} diff --git a/src/Umbraco.Web.UI.Client/libs/notification/notification.stories.mdx b/src/Umbraco.Web.UI.Client/libs/notification/notification.stories.mdx index e2a4d0d076..3dcf56a53c 100644 --- a/src/Umbraco.Web.UI.Client/libs/notification/notification.stories.mdx +++ b/src/Umbraco.Web.UI.Client/libs/notification/notification.stories.mdx @@ -20,7 +20,7 @@ The UmbNotification service can be used to open notifications. ```ts import { html, LitElement } from 'lit'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; import type { UmbNotificationService, UMB_NOTIFICATION_SERVICE_CONTEXT_ALIAS } from './core/services/notification'; class MyElement extends UmbLitElement { @@ -44,7 +44,7 @@ A notification is opened by calling one of the helper methods on the UmbNotifica ```ts import { html, LitElement } from 'lit'; import { state } from 'lit/decorators.js'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; import type { UmbNotificationService, UmbNotificationDefaultData, diff --git a/src/Umbraco.Web.UI.Client/libs/notification/notification.stories.ts b/src/Umbraco.Web.UI.Client/libs/notification/notification.stories.ts index dba220d258..f1b19deb37 100644 --- a/src/Umbraco.Web.UI.Client/libs/notification/notification.stories.ts +++ b/src/Umbraco.Web.UI.Client/libs/notification/notification.stories.ts @@ -13,7 +13,7 @@ import { UmbNotificationService, UMB_NOTIFICATION_SERVICE_CONTEXT_TOKEN, } from '.'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; export default { title: 'API/Notifications/Overview', diff --git a/src/Umbraco.Web.UI.Client/libs/notification/package.json b/src/Umbraco.Web.UI.Client/libs/notification/package.json new file mode 100644 index 0000000000..7ace02f3cd --- /dev/null +++ b/src/Umbraco.Web.UI.Client/libs/notification/package.json @@ -0,0 +1,16 @@ +{ + "name": "@umbraco-cms/notification", + "version": "0.0.0", + "description": "", + "module": "dist/index.js", + "type": "module", + "files": [ + "dist" + ], + "scripts": { + "build": "rollup -c", + "test": "echo \"Error: no test specified\" && exit 1" + }, + "author": "Umbraco HQ", + "license": "MIT" +} diff --git a/src/Umbraco.Web.UI.Client/libs/observable-api/package.json b/src/Umbraco.Web.UI.Client/libs/observable-api/package.json new file mode 100644 index 0000000000..4c3c73135c --- /dev/null +++ b/src/Umbraco.Web.UI.Client/libs/observable-api/package.json @@ -0,0 +1,19 @@ +{ + "name": "@umbraco-cms/observable-api", + "version": "0.0.0", + "description": "", + "module": "dist/index.js", + "type": "module", + "files": [ + "dist" + ], + "scripts": { + "build": "rollup -c", + "test": "echo \"Error: no test specified\" && exit 1" + }, + "dependencies": { + "rxjs": "^6.6.3" + }, + "author": "Umbraco HQ", + "license": "MIT" +} diff --git a/src/Umbraco.Web.UI.Client/libs/resources/package.json b/src/Umbraco.Web.UI.Client/libs/resources/package.json new file mode 100644 index 0000000000..8c72fc92d3 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/libs/resources/package.json @@ -0,0 +1,16 @@ +{ + "name": "@umbraco-cms/resources", + "version": "0.0.0", + "description": "", + "module": "dist/index.js", + "type": "module", + "files": [ + "dist" + ], + "scripts": { + "build": "rollup -c", + "test": "echo \"Error: no test specified\" && exit 1" + }, + "author": "Umbraco HQ", + "license": "MIT" +} diff --git a/src/Umbraco.Web.UI.Client/public/mockServiceWorker.js b/src/Umbraco.Web.UI.Client/public/mockServiceWorker.js index 671ec2cbd0..70f0a2b994 100644 --- a/src/Umbraco.Web.UI.Client/public/mockServiceWorker.js +++ b/src/Umbraco.Web.UI.Client/public/mockServiceWorker.js @@ -2,7 +2,7 @@ /* tslint:disable */ /** - * Mock Service Worker (0.49.3). + * Mock Service Worker (0.49.2). * @see https://github.com/mswjs/msw * - Please do NOT modify this file. * - Please do NOT serve this file on production. diff --git a/src/Umbraco.Web.UI.Client/src/app.ts b/src/Umbraco.Web.UI.Client/src/app.ts index 55d8c9bcfc..386294ca18 100644 --- a/src/Umbraco.Web.UI.Client/src/app.ts +++ b/src/Umbraco.Web.UI.Client/src/app.ts @@ -18,7 +18,7 @@ import { UUIIconRegistryEssential } from '@umbraco-ui/uui'; import { css, html } from 'lit'; import { customElement, property, state } from 'lit/decorators.js'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; import { tryExecuteAndNotify } from '@umbraco-cms/resources'; import { OpenAPI, RuntimeLevel, ServerResource } from '@umbraco-cms/backend-api'; import { UmbIconStore } from '@umbraco-cms/store'; diff --git a/src/Umbraco.Web.UI.Client/src/auth/external-login-providers/external-login-provider-test.element.ts b/src/Umbraco.Web.UI.Client/src/auth/external-login-providers/external-login-provider-test.element.ts index 1ab5c85b50..e9a3ccb26c 100644 --- a/src/Umbraco.Web.UI.Client/src/auth/external-login-providers/external-login-provider-test.element.ts +++ b/src/Umbraco.Web.UI.Client/src/auth/external-login-providers/external-login-provider-test.element.ts @@ -1,7 +1,7 @@ import { css, html } from 'lit'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement } from 'lit/decorators.js'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; @customElement('umb-external-login-provider-test') export class UmbExternalLoginProviderTestElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/auth/external-login-providers/external-login-provider-test2.element.ts b/src/Umbraco.Web.UI.Client/src/auth/external-login-providers/external-login-provider-test2.element.ts index 8dfaeba518..a9ed172f2b 100644 --- a/src/Umbraco.Web.UI.Client/src/auth/external-login-providers/external-login-provider-test2.element.ts +++ b/src/Umbraco.Web.UI.Client/src/auth/external-login-providers/external-login-provider-test2.element.ts @@ -1,7 +1,7 @@ import { css, html } from 'lit'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement } from 'lit/decorators.js'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; @customElement('umb-external-login-provider-test2') export class UmbExternalLoginProviderTest2Element extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/backoffice.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/backoffice.element.ts index 1b05b265fd..606c2efbec 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/backoffice.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/backoffice.element.ts @@ -29,7 +29,7 @@ import { import { UmbSectionStore, UMB_SECTION_STORE_CONTEXT_TOKEN } from './shared/components/section/section.store'; import { UmbDataTypeStore, UMB_DATA_TYPE_STORE_CONTEXT_TOKEN } from './settings/data-types/data-type.store'; import { UmbNotificationService, UMB_NOTIFICATION_SERVICE_CONTEXT_TOKEN } from '@umbraco-cms/notification'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; // Domains import './settings'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/sidebar-menu-item/document-types-sidebar-menu-item.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/sidebar-menu-item/document-types-sidebar-menu-item.element.ts index b65117d731..83abf9d6b6 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/sidebar-menu-item/document-types-sidebar-menu-item.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/sidebar-menu-item/document-types-sidebar-menu-item.element.ts @@ -1,6 +1,6 @@ import { html, nothing } from 'lit'; import { customElement, state } from 'lit/decorators.js'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; @customElement('umb-document-types-sidebar-menu-item') export class UmbDocumentTypesSidebarMenuItemElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/workspace/document-type-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/workspace/document-type-workspace.element.ts index 70570a79d2..3c799f13c7 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/workspace/document-type-workspace.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/workspace/document-type-workspace.element.ts @@ -6,7 +6,7 @@ import { distinctUntilChanged } from 'rxjs'; import { UmbWorkspaceDocumentTypeContext } from './document-type-workspace.context'; import type { DocumentTypeDetails } from '@umbraco-cms/models'; import { UmbModalService, UMB_MODAL_SERVICE_CONTEXT_TOKEN } from 'src/core/modal'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; import type { UmbWorkspaceEntityElement } from 'src/backoffice/shared/components/workspace/workspace-entity-element.interface'; @customElement('umb-document-type-workspace') diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/workspace/views/design/workspace-view-document-type-design.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/workspace/views/design/workspace-view-document-type-design.element.ts index 89433e628e..146230903f 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/workspace/views/design/workspace-view-document-type-design.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/workspace/views/design/workspace-view-document-type-design.element.ts @@ -4,7 +4,7 @@ import { customElement, state } from 'lit/decorators.js'; import { distinctUntilChanged } from 'rxjs'; import { UmbWorkspaceDocumentTypeContext } from '../../document-type-workspace.context'; import type { UmbDocumentTypeStoreItemType } from '../../../document-type.store'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; @customElement('umb-workspace-view-document-type-design') export class UmbWorkspaceViewDocumentTypeDesignElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/sidebar-menu-item/document-sidebar-menu-item.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/sidebar-menu-item/document-sidebar-menu-item.element.ts index a6e2758d5a..d0e12bfbd7 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/sidebar-menu-item/document-sidebar-menu-item.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/sidebar-menu-item/document-sidebar-menu-item.element.ts @@ -1,6 +1,6 @@ import { html } from 'lit'; import { customElement } from 'lit/decorators.js'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; @customElement('umb-document-sidebar-menu-item') export class UmbDocumentSidebarMenuItemElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/document-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/document-workspace.element.ts index beaa08f875..7f3f28b048 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/document-workspace.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/document-workspace.element.ts @@ -2,7 +2,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { css, html } from 'lit'; import { customElement, property } from 'lit/decorators.js'; import { UmbWorkspaceDocumentContext } from './document-workspace.context'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; import type { UmbWorkspaceEntityElement } from 'src/backoffice/shared/components/workspace/workspace-entity-element.interface'; @customElement('umb-document-workspace') diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/media/media-types/sidebar-menu-item/media-types-sidebar-menu-item.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/media/media-types/sidebar-menu-item/media-types-sidebar-menu-item.element.ts index 6c9cdc40ea..1ad71be2bb 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/media/media-types/sidebar-menu-item/media-types-sidebar-menu-item.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/media/media-types/sidebar-menu-item/media-types-sidebar-menu-item.element.ts @@ -1,6 +1,6 @@ import { html, nothing } from 'lit'; import { customElement, state } from 'lit/decorators.js'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; @customElement('umb-media-types-sidebar-menu-item') export class UmbMediaTypesSidebarMenuItemElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/media/media/sidebar-menu-item/media-sidebar-menu-item.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/media/media/sidebar-menu-item/media-sidebar-menu-item.element.ts index 3149065081..a32ff11d13 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/media/media/sidebar-menu-item/media-sidebar-menu-item.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/media/media/sidebar-menu-item/media-sidebar-menu-item.element.ts @@ -1,6 +1,6 @@ import { html } from 'lit'; import { customElement } from 'lit/decorators.js'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; @customElement('umb-media-sidebar-menu-item') export class UmbMediaSidebarMenuItemElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/media/media/workspace/media-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/media/media/workspace/media-workspace.element.ts index 5c5ce1b4f9..5b6dca7d65 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/media/media/workspace/media-workspace.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/media/media/workspace/media-workspace.element.ts @@ -2,7 +2,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { css, html } from 'lit'; import { customElement, property } from 'lit/decorators.js'; import { UmbWorkspaceMediaContext } from './media-workspace.context'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; @customElement('umb-media-workspace') export class UmbMediaWorkspaceElement extends UmbLitElement { @@ -36,6 +36,7 @@ export class UmbMediaWorkspaceElement extends UmbLitElement { private _workspaceContext: UmbWorkspaceMediaContext = new UmbWorkspaceMediaContext(this); + render() { return html``; } diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/members/member-groups/sidebar-menu-item/member-groups-sidebar-menu-item.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/members/member-groups/sidebar-menu-item/member-groups-sidebar-menu-item.element.ts index 298722af3e..2ef51fc654 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/members/member-groups/sidebar-menu-item/member-groups-sidebar-menu-item.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/members/member-groups/sidebar-menu-item/member-groups-sidebar-menu-item.element.ts @@ -1,6 +1,6 @@ import { html, nothing } from 'lit'; import { customElement, state } from 'lit/decorators.js'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; @customElement('umb-member-groups-sidebar-menu-item') export class UmbMemberGroupsSidebarMenuItemElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/members/member-types/sidebar-menu-item/member-types-sidebar-menu-item.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/members/member-types/sidebar-menu-item/member-types-sidebar-menu-item.element.ts index 4e05003f37..d23919ce4c 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/members/member-types/sidebar-menu-item/member-types-sidebar-menu-item.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/members/member-types/sidebar-menu-item/member-types-sidebar-menu-item.element.ts @@ -1,6 +1,6 @@ import { html, nothing } from 'lit'; import { customElement, state } from 'lit/decorators.js'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; @customElement('umb-member-types-sidebar-menu-item') export class UmbMemberTypesSidebarMenuItemElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/members/members/sidebar-menu-item/members-sidebar-menu-item.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/members/members/sidebar-menu-item/members-sidebar-menu-item.element.ts index b888ee60f1..3a9f7e7e87 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/members/members/sidebar-menu-item/members-sidebar-menu-item.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/members/members/sidebar-menu-item/members-sidebar-menu-item.element.ts @@ -1,6 +1,6 @@ import { html, nothing } from 'lit'; import { customElement, state } from 'lit/decorators.js'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; @customElement('umb-members-sidebar-menu-item') export class UmbMembersSidebarMenuItemElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/packages/package-section/views/created/created-packages-section-view.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/packages/package-section/views/created/created-packages-section-view.element.ts index c96df1774e..77cb8cb4d3 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/packages/package-section/views/created/created-packages-section-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/packages/package-section/views/created/created-packages-section-view.element.ts @@ -4,7 +4,7 @@ import { IRoute, IRoutingInfo } from 'router-slot'; import type { ManifestWorkspace } from '@umbraco-cms/models'; import { createExtensionElement } from '@umbraco-cms/extensions-api'; import { umbExtensionsRegistry } from '@umbraco-cms/extensions-registry'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; @customElement('umb-created-packages-section-view') export class UmbCreatedPackagesSectionViewElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/packages/package-section/views/installed/installed-packages-section-view.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/packages/package-section/views/installed/installed-packages-section-view.element.ts index 9a47c7aff4..e0f485e060 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/packages/package-section/views/installed/installed-packages-section-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/packages/package-section/views/installed/installed-packages-section-view.element.ts @@ -4,7 +4,7 @@ import { IRoute, IRoutingInfo } from 'router-slot'; import type { ManifestWorkspace } from '@umbraco-cms/models'; import { createExtensionElement } from '@umbraco-cms/extensions-api'; import { umbExtensionsRegistry } from '@umbraco-cms/extensions-registry'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; @customElement('umb-installed-packages-section-view') export class UmbInstalledPackagesSectionViewElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/packages/package-section/views/installed/packages-installed-item.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/packages/package-section/views/installed/packages-installed-item.element.ts index 9849d188c8..445c521893 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/packages/package-section/views/installed/packages-installed-item.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/packages/package-section/views/installed/packages-installed-item.element.ts @@ -7,7 +7,7 @@ import { createExtensionElement } from '@umbraco-cms/extensions-api'; import { umbExtensionsRegistry } from '@umbraco-cms/extensions-registry'; import type { ManifestPackageView } from '@umbraco-cms/models'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; @customElement('umb-packages-installed-item') export class UmbPackagesInstalledItem extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/dashboard-examine-management.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/dashboard-examine-management.element.ts index d6d166c8e7..3ad1c32254 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/dashboard-examine-management.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/dashboard-examine-management.element.ts @@ -5,7 +5,7 @@ import { IRoute, IRoutingInfo, path } from 'router-slot'; import { UmbDashboardExamineIndexElement } from './views/section-view-examine-indexers'; import { UmbDashboardExamineSearcherElement } from './views/section-view-examine-searchers'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; @customElement('umb-dashboard-examine-management') export class UmbDashboardExamineManagementElement extends UmbLitElement { @@ -60,7 +60,7 @@ export class UmbDashboardExamineManagementElement extends UmbLitElement { } private get backbutton(): boolean { - return !this._currentPath?.endsWith('examine-management/'); + return !(this._currentPath?.endsWith('examine-management/')); } render() { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/views/section-view-examine-indexers.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/views/section-view-examine-indexers.ts index 3340bcc296..e69109991a 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/views/section-view-examine-indexers.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/views/section-view-examine-indexers.ts @@ -9,7 +9,7 @@ import { UmbModalService, UMB_MODAL_SERVICE_CONTEXT_TOKEN } from '../../../../.. import './section-view-examine-searchers'; import { HealthStatus, Index, IndexerResource } from '@umbraco-cms/backend-api'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; import { tryExecuteAndNotify } from '@umbraco-cms/resources'; @customElement('umb-dashboard-examine-index') diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/views/section-view-examine-overview.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/views/section-view-examine-overview.ts index 61ee6799cd..483d0099ce 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/views/section-view-examine-overview.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/views/section-view-examine-overview.ts @@ -3,7 +3,7 @@ import { css, html, nothing } from 'lit'; import { customElement, state } from 'lit/decorators.js'; import { HealthStatus, Index, IndexerResource, Searcher, SearcherResource } from '@umbraco-cms/backend-api'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; import { tryExecuteAndNotify } from '@umbraco-cms/resources'; @customElement('umb-dashboard-examine-overview') diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/views/section-view-examine-searchers.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/views/section-view-examine-searchers.ts index 6de07bdf64..05f27c3337 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/views/section-view-examine-searchers.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/views/section-view-examine-searchers.ts @@ -5,7 +5,7 @@ import { customElement, state, query, property } from 'lit/decorators.js'; import { UmbModalService, UMB_MODAL_SERVICE_CONTEXT_TOKEN } from '../../../../../core/modal'; import { SearchResult, SearcherResource, Field } from '@umbraco-cms/backend-api'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; import { tryExecuteAndNotify } from '@umbraco-cms/resources'; import './modal-views/fields-viewer.element'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/models-builder/dashboard-models-builder.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/models-builder/dashboard-models-builder.element.ts index 6b13ba8b67..8f550d7bbd 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/models-builder/dashboard-models-builder.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/models-builder/dashboard-models-builder.element.ts @@ -4,7 +4,7 @@ import { css, html, nothing } from 'lit'; import { customElement, state } from 'lit/decorators.js'; import { ModelsBuilder, ModelsBuilderResource, ModelsMode } from '@umbraco-cms/backend-api'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; import { tryExecuteAndNotify } from '@umbraco-cms/resources'; @customElement('umb-dashboard-models-builder') diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/performance-profiling/dashboard-performance-profiling.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/performance-profiling/dashboard-performance-profiling.element.ts index fe845a3b37..fb74431a4b 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/performance-profiling/dashboard-performance-profiling.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/performance-profiling/dashboard-performance-profiling.element.ts @@ -3,7 +3,7 @@ import { css, html } from 'lit'; import { customElement, state } from 'lit/decorators.js'; import { ProfilingResource } from '@umbraco-cms/backend-api'; import { tryExecuteAndNotify } from '@umbraco-cms/resources'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; @customElement('umb-dashboard-performance-profiling') export class UmbDashboardPerformanceProfilingElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/published-status/dashboard-published-status.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/published-status/dashboard-published-status.element.ts index 5c2990b104..c91b095df2 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/published-status/dashboard-published-status.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/published-status/dashboard-published-status.element.ts @@ -7,7 +7,7 @@ import { UmbModalService, UMB_MODAL_SERVICE_CONTEXT_TOKEN } from '../../../../co import { PublishedCacheResource } from '@umbraco-cms/backend-api'; import { tryExecuteAndNotify } from '@umbraco-cms/resources'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; @customElement('umb-dashboard-published-status') export class UmbDashboardPublishedStatusElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/telemetry/dashboard-telemetry.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/telemetry/dashboard-telemetry.element.ts index e89fbc9571..81f1eee017 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/telemetry/dashboard-telemetry.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/telemetry/dashboard-telemetry.element.ts @@ -4,7 +4,7 @@ import { unsafeHTML } from 'lit/directives/unsafe-html.js'; import { UUIButtonState } from '@umbraco-ui/uui'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { Telemetry, TelemetryLevel, TelemetryResource } from '@umbraco-cms/backend-api'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; import { tryExecuteAndNotify } from '@umbraco-cms/resources'; @customElement('umb-dashboard-telemetry') diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/sidebar-menu-item/data-types-sidebar-menu-item.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/sidebar-menu-item/data-types-sidebar-menu-item.element.ts index 8ff28f638a..cb94248015 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/sidebar-menu-item/data-types-sidebar-menu-item.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/sidebar-menu-item/data-types-sidebar-menu-item.element.ts @@ -1,6 +1,6 @@ import { html, nothing } from 'lit'; import { customElement, state } from 'lit/decorators.js'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; @customElement('umb-data-types-sidebar-menu-item') export class UmbDataTypesSidebarMenuItemElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/workspace/data-type-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/workspace/data-type-workspace.element.ts index f37d024b52..51c2ecdd44 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/workspace/data-type-workspace.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/workspace/data-type-workspace.element.ts @@ -4,7 +4,7 @@ import { css, html } from 'lit'; import { customElement, property, state } from 'lit/decorators.js'; import { distinctUntilChanged } from 'rxjs'; import { UmbWorkspaceDataTypeContext } from './data-type-workspace.context'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; /** * @element umb-data-type-workspace diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/workspace/views/edit/data-type-workspace-view-edit.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/workspace/views/edit/data-type-workspace-view-edit.element.ts index feaa116f91..3ad679fa59 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/workspace/views/edit/data-type-workspace-view-edit.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/workspace/views/edit/data-type-workspace-view-edit.element.ts @@ -3,7 +3,7 @@ import { css, html, nothing } from 'lit'; import { customElement, state } from 'lit/decorators.js'; import { UmbModalService, UMB_MODAL_SERVICE_CONTEXT_TOKEN } from '../../../../../../core/modal'; import { UmbWorkspaceDataTypeContext } from '../../data-type-workspace.context'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; import type { DataTypeDetails } from '@umbraco-cms/models'; import { umbExtensionsRegistry } from '@umbraco-cms/extensions-registry'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/workspace/views/info/workspace-view-data-type-info.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/workspace/views/info/workspace-view-data-type-info.element.ts index 26af618a4a..fa4ecf1bf8 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/workspace/views/info/workspace-view-data-type-info.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/workspace/views/info/workspace-view-data-type-info.element.ts @@ -4,7 +4,7 @@ import { customElement, state } from 'lit/decorators.js'; import { distinctUntilChanged } from 'rxjs'; import { UmbWorkspaceDataTypeContext } from '../../data-type-workspace.context'; import type { DataTypeDetails } from '@umbraco-cms/models'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; @customElement('umb-workspace-view-data-type-info') export class UmbWorkspaceViewDataTypeInfoElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/extensions/workspace/extension-root-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/extensions/workspace/extension-root-workspace.element.ts index 9809f061ad..557c5f01e3 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/extensions/workspace/extension-root-workspace.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/extensions/workspace/extension-root-workspace.element.ts @@ -3,7 +3,7 @@ import { customElement, state } from 'lit/decorators.js'; import { isManifestElementNameType } from '@umbraco-cms/extensions-api'; import { umbExtensionsRegistry } from '@umbraco-cms/extensions-registry'; import type { ManifestBase } from '@umbraco-cms/models'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; @customElement('umb-extension-root-workspace') export class UmbExtensionRootWorkspaceElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/workspace/language/language-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/workspace/language/language-workspace.element.ts index 901f6d2e44..598f869a85 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/workspace/language/language-workspace.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/workspace/language/language-workspace.element.ts @@ -2,7 +2,7 @@ import { html } from 'lit'; import { customElement } from 'lit/decorators.js'; import { UMB_NOTIFICATION_SERVICE_CONTEXT_TOKEN } from '@umbraco-cms/notification'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; @customElement('umb-language-workspace') export class UmbLanguageWorkspaceElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/collection/bulk-actions/collection-bulk-action-media-delete.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/collection/bulk-actions/collection-bulk-action-media-delete.element.ts index c5204a1360..1001bfbbdd 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/collection/bulk-actions/collection-bulk-action-media-delete.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/collection/bulk-actions/collection-bulk-action-media-delete.element.ts @@ -4,7 +4,7 @@ import { customElement } from 'lit/decorators.js'; import { ifDefined } from 'lit/directives/if-defined.js'; import { UmbCollectionContext, UMB_COLLECTION_CONTEXT_TOKEN } from '../collection.context'; import type { ManifestCollectionBulkAction } from '@umbraco-cms/models'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; @customElement('umb-collection-bulk-action-media-delete') export class UmbCollectionBulkActionDeleteElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/collection/collection-selection-actions.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/collection/collection-selection-actions.element.ts index c6f9151ec9..1d85b374b5 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/collection/collection-selection-actions.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/collection/collection-selection-actions.element.ts @@ -3,7 +3,7 @@ import { css, html, nothing } from 'lit'; import { customElement, property, state } from 'lit/decorators.js'; import { UmbCollectionContext, UMB_COLLECTION_CONTEXT_TOKEN } from './collection.context'; import type { MediaDetails } from '@umbraco-cms/models'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; @customElement('umb-collection-selection-actions') export class UmbCollectionSelectionActionsElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/collection/collection-toolbar.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/collection/collection-toolbar.element.ts index 2c19aa919e..fedfed7109 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/collection/collection-toolbar.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/collection/collection-toolbar.element.ts @@ -6,7 +6,7 @@ import { TooltipMenuItem } from '../components/tooltip-menu'; import '../components/tooltip-menu/tooltip-menu.element'; import type { ManifestCollectionView } from '@umbraco-cms/models'; import { umbExtensionsRegistry } from '@umbraco-cms/extensions-registry'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; @customElement('umb-collection-toolbar') export class UmbCollectionToolbarElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/collection/collection.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/collection/collection.element.ts index 4b1d649c95..2a75c95f73 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/collection/collection.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/collection/collection.element.ts @@ -8,7 +8,7 @@ import { UmbCollectionContext, UMB_COLLECTION_CONTEXT_TOKEN } from './collection import { createExtensionElement } from '@umbraco-cms/extensions-api'; import type { ManifestCollectionView, MediaDetails } from '@umbraco-cms/models'; import { umbExtensionsRegistry } from '@umbraco-cms/extensions-registry'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; import type { UmbObserverController } from '@umbraco-cms/observable-api'; @customElement('umb-collection') diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/collection/dashboards/dashboard-collection.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/collection/dashboards/dashboard-collection.element.ts index 9d4f7825a9..97719a81ea 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/collection/dashboards/dashboard-collection.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/collection/dashboards/dashboard-collection.element.ts @@ -9,7 +9,7 @@ import { UMB_COLLECTION_CONTEXT_TOKEN, } from 'src/backoffice/shared/collection/collection.context'; import type { ManifestDashboardCollection } from '@umbraco-cms/models'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; @customElement('umb-dashboard-collection') export class UmbDashboardCollectionElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/collection/views/collection-view-media-grid.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/collection/views/collection-view-media-grid.element.ts index 4d9e88948f..794cdb6f6a 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/collection/views/collection-view-media-grid.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/collection/views/collection-view-media-grid.element.ts @@ -4,7 +4,7 @@ import { customElement, state } from 'lit/decorators.js'; import { repeat } from 'lit/directives/repeat.js'; import { UmbCollectionContext, UMB_COLLECTION_CONTEXT_TOKEN } from '../collection.context'; import type { MediaDetails } from '@umbraco-cms/models'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; @customElement('umb-collection-view-media-grid') export class UmbCollectionViewsMediaGridElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/collection/views/collection-view-media-table.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/collection/views/collection-view-media-table.element.ts index 7d401aee2b..258a0a7465 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/collection/views/collection-view-media-table.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/collection/views/collection-view-media-table.element.ts @@ -3,7 +3,7 @@ import { css, html } from 'lit'; import { customElement, state } from 'lit/decorators.js'; import { UmbCollectionContext, UMB_COLLECTION_CONTEXT_TOKEN } from '../collection.context'; import type { MediaDetails } from '@umbraco-cms/models'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; import { UmbTableColumn, UmbTableConfig, diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/backoffice-frame/backoffice-header-sections.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/backoffice-frame/backoffice-header-sections.element.ts index a76f1bd95d..ba01e94be6 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/backoffice-frame/backoffice-header-sections.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/backoffice-frame/backoffice-header-sections.element.ts @@ -4,7 +4,7 @@ import { customElement, state } from 'lit/decorators.js'; import { when } from 'lit/directives/when.js'; import { UmbSectionStore, UMB_SECTION_STORE_CONTEXT_TOKEN } from '../section/section.store'; import type { ManifestSection } from '@umbraco-cms/models'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; @customElement('umb-backoffice-header-sections') export class UmbBackofficeHeaderSections extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/backoffice-frame/backoffice-main.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/backoffice-frame/backoffice-main.element.ts index 3aab7e9705..5782cf7c17 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/backoffice-frame/backoffice-main.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/backoffice-frame/backoffice-main.element.ts @@ -8,7 +8,7 @@ import { UmbSectionContext, UMB_SECTION_CONTEXT_TOKEN } from '../section/section import { createExtensionElement } from '@umbraco-cms/extensions-api'; import type { ManifestSection } from '@umbraco-cms/models'; import { UmbSectionElement } from 'src/backoffice/shared/components/section/section.element'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; @defineElement('umb-backoffice-main') export class UmbBackofficeMain extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/backoffice-frame/backoffice-modal-container.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/backoffice-frame/backoffice-modal-container.element.ts index fe538633f3..49298c46ed 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/backoffice-frame/backoffice-modal-container.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/backoffice-frame/backoffice-modal-container.element.ts @@ -3,7 +3,7 @@ import { css, CSSResultGroup, html } from 'lit'; import { customElement, state } from 'lit/decorators.js'; import { repeat } from 'lit/directives/repeat.js'; import { UmbModalHandler, UmbModalService, UMB_MODAL_SERVICE_CONTEXT_TOKEN } from '../../../../core/modal'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; @customElement('umb-backoffice-modal-container') export class UmbBackofficeModalContainer extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/backoffice-frame/backoffice-notification-container.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/backoffice-frame/backoffice-notification-container.element.ts index 5024b7b27c..c222b88208 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/backoffice-frame/backoffice-notification-container.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/backoffice-frame/backoffice-notification-container.element.ts @@ -7,7 +7,7 @@ import { UmbNotificationService, UMB_NOTIFICATION_SERVICE_CONTEXT_TOKEN, } from '@umbraco-cms/notification'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; @customElement('umb-backoffice-notification-container') export class UmbBackofficeNotificationContainer extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/content-property/content-property.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/content-property/content-property.element.ts index ecf42bf4c4..7ade9d09a1 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/content-property/content-property.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/content-property/content-property.element.ts @@ -7,7 +7,7 @@ import { UmbDataTypeStore, UMB_DATA_TYPE_STORE_CONTEXT_TOKEN } from '../../../se import type { ContentProperty, DataTypeDetails } from '@umbraco-cms/models'; import '../workspace-property/workspace-property.element'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; import { UmbObserverController } from '@umbraco-cms/observable-api'; @customElement('umb-content-property') diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/extension-slot/extension-slot.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/extension-slot/extension-slot.element.ts index e39936df6b..d5cb2940e1 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/extension-slot/extension-slot.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/extension-slot/extension-slot.element.ts @@ -5,7 +5,7 @@ import { map } from 'rxjs'; import { repeat } from 'lit/directives/repeat.js'; import { umbExtensionsRegistry } from '@umbraco-cms/extensions-registry'; import { createExtensionElement, isManifestElementableType } from '@umbraco-cms/extensions-api'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; export type InitializedExtension = { alias: string; weight: number; component: HTMLElement | null }; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-document-picker/input-document-picker.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-document-picker/input-document-picker.element.ts index f10ca3d696..31432bdac6 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-document-picker/input-document-picker.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-document-picker/input-document-picker.element.ts @@ -5,7 +5,7 @@ import { ifDefined } from 'lit-html/directives/if-defined.js'; import { FormControlMixin } from '@umbraco-ui/uui-base/lib/mixins'; import { UmbModalService, UMB_MODAL_SERVICE_CONTEXT_TOKEN } from 'src/core/modal'; import type { FolderTreeItem } from '@umbraco-cms/backend-api'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; import type { UmbObserverController } from '@umbraco-cms/observable-api'; import { UmbDocumentStore, UMB_DOCUMENT_STORE_CONTEXT_TOKEN } from 'src/backoffice/documents/documents/document.store'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-list-base/input-list-base.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-list-base/input-list-base.ts index b4542ec1d7..847b7b9155 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-list-base/input-list-base.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-list-base/input-list-base.ts @@ -8,7 +8,7 @@ import { UmbModalService, UmbModalType, UMB_MODAL_SERVICE_CONTEXT_TOKEN } from ' import '../../../../core/modal/layouts/picker-section/picker-layout-section.element'; import '../../../../core/modal/layouts/picker-user-group/picker-layout-user-group.element'; import '../../../../core/modal/layouts/picker-user/picker-layout-user.element'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; /** TODO: Make use of UUI FORM Mixin, to make it easily take part of a form. */ export class UmbInputListBase extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-number-range/input-number-range.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-number-range/input-number-range.element.ts index fc12451c98..8cf1a4ed09 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-number-range/input-number-range.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-number-range/input-number-range.element.ts @@ -2,22 +2,27 @@ import { css, html } from 'lit'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, property, state } from 'lit/decorators.js'; import { FormControlMixin } from '@umbraco-ui/uui-base/lib/mixins'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; function getNumberOrUndefined(value: string) { - const num = parseInt(value, 10); - return isNaN(num) ? undefined : num; + const num = parseInt(value, 10); + return isNaN(num) ? undefined : num; } @customElement('umb-input-number-range') export class UmbInputNumberRangeElement extends FormControlMixin(UmbLitElement) { - static styles = [UUITextStyles, css``]; + static styles = [ + UUITextStyles, + css` - @property({ type: String, attribute: 'min-label' }) - minLabel = 'Low value'; + `, + ]; - @property({ type: String, attribute: 'max-label' }) - maxLabel = 'High value'; + @property({type: String, attribute:'min-label'}) + minLabel = "Low value" + + @property({type: String, attribute:'max-label'}) + maxLabel = "High value" @state() private _minValue?: number; @@ -42,15 +47,15 @@ export class UmbInputNumberRangeElement extends FormControlMixin(UmbLitElement) } private updateValue() { - const newValue = this._minValue || this._maxValue ? (this._minValue || '') + ',' + (this._maxValue || '') : ''; - if (super.value !== newValue) { + const newValue = (this._minValue || this._maxValue) ? (this._minValue || '')+','+(this._maxValue || '') : ''; + if(super.value !== newValue) { super.value = newValue; } } @property() public set value(keysString: string) { - if (keysString !== this._value) { + if(keysString !== this._value) { const splittedValue = keysString.split(/[ ,]+/); this.minValue = getNumberOrUndefined(splittedValue[0]); this.maxValue = getNumberOrUndefined(splittedValue[1]); @@ -61,29 +66,26 @@ export class UmbInputNumberRangeElement extends FormControlMixin(UmbLitElement) super(); } - protected getFormElement() { - return this; - } + protected getFormElement() { + return this; + } - private _onMinInput(e: InputEvent) { + private _onMinInput(e:InputEvent) { this.minValue = Number((e.target as HTMLInputElement).value); this.dispatchEvent(new CustomEvent('change', { bubbles: true, composed: true })); } - private _onMaxInput(e: InputEvent) { + private _onMaxInput(e:InputEvent) { this.maxValue = Number((e.target as HTMLInputElement).value); this.dispatchEvent(new CustomEvent('change', { bubbles: true, composed: true })); } + + render() { - return html` - – - `; + return html` – `; } + } export default UmbInputNumberRangeElement; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/section/section-dashboards/section-dashboards.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/section/section-dashboards/section-dashboards.element.ts index a2c492cd60..ba493baa14 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/section/section-dashboards/section-dashboards.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/section/section-dashboards/section-dashboards.element.ts @@ -12,7 +12,7 @@ import type { ManifestWithMeta, } from '@umbraco-cms/models'; import { umbExtensionsRegistry } from '@umbraco-cms/extensions-registry'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; @customElement('umb-section-dashboards') export class UmbSectionDashboardsElement extends UmbLitElement { @@ -41,7 +41,7 @@ export class UmbSectionDashboardsElement extends UmbLitElement { height: 100%; box-sizing: border-box; display: block; - padding: var(--uui-size-5); + padding:var(--uui-size-5); } `, ]; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/section/section-sidebar-menu/section-sidebar-menu.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/section/section-sidebar-menu/section-sidebar-menu.element.ts index 2ca96b9d8d..f46bc00785 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/section/section-sidebar-menu/section-sidebar-menu.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/section/section-sidebar-menu/section-sidebar-menu.element.ts @@ -3,7 +3,7 @@ import { html } from 'lit'; import { customElement, state } from 'lit/decorators.js'; import { UmbSectionContext, UMB_SECTION_CONTEXT_TOKEN } from '../section.context'; import { ManifestSidebarMenuItem } from '@umbraco-cms/extensions-registry'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; import './sidebar-menu-item.element.ts'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/section/section-sidebar-menu/sidebar-menu-item.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/section/section-sidebar-menu/sidebar-menu-item.element.ts index 05b6f9b6e8..81df6319d5 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/section/section-sidebar-menu/sidebar-menu-item.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/section/section-sidebar-menu/sidebar-menu-item.element.ts @@ -2,7 +2,7 @@ import { v4 as uuidv4 } from 'uuid'; import { css, html } from 'lit'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, property } from 'lit/decorators.js'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; import type { ManifestSidebarMenuItem } from '@umbraco-cms/models'; @customElement('umb-sidebar-menu-item') diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/section/section-sidebar/section-sidebar.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/section/section-sidebar/section-sidebar.element.ts index 6add77bb40..7964674b21 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/section/section-sidebar/section-sidebar.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/section/section-sidebar/section-sidebar.element.ts @@ -5,7 +5,7 @@ import { UmbSectionContext, UMB_SECTION_CONTEXT_TOKEN } from '../section.context import type { ManifestSection } from '@umbraco-cms/models'; import '../../tree/context-menu/tree-context-menu.service'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; @customElement('umb-section-sidebar') export class UmbSectionSidebarElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/section/section-views/section-views.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/section/section-views/section-views.element.ts index e8817953cc..c7d498e252 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/section/section-views/section-views.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/section/section-views/section-views.element.ts @@ -5,7 +5,7 @@ import { EMPTY, map, of, Subscription, switchMap } from 'rxjs'; import { UmbSectionContext, UMB_SECTION_CONTEXT_TOKEN } from '../section.context'; import type { ManifestSectionView } from '@umbraco-cms/models'; import { umbExtensionsRegistry } from '@umbraco-cms/extensions-registry'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; @customElement('umb-section-views') export class UmbSectionViewsElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/section/section.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/section/section.element.ts index 35652dbd98..4b04b25ca2 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/section/section.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/section/section.element.ts @@ -8,7 +8,7 @@ import { UmbSectionContext, UMB_SECTION_CONTEXT_TOKEN } from './section.context' import { createExtensionElement } from '@umbraco-cms/extensions-api'; import type { ManifestSectionView, ManifestWorkspace, ManifestSidebarMenuItem } from '@umbraco-cms/models'; import { umbExtensionsRegistry } from '@umbraco-cms/extensions-registry'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; import './section-sidebar-menu/section-sidebar-menu.element.ts'; import './section-views/section-views.element.ts'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/action/tree-item-action.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/action/tree-item-action.element.ts index 07be43b98b..a738d06b5f 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/action/tree-item-action.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/action/tree-item-action.element.ts @@ -9,7 +9,7 @@ import { UMB_TREE_CONTEXT_MENU_SERVICE_CONTEXT_TOKEN, } from '../context-menu/tree-context-menu.service'; import type { Entity, ManifestTreeItemAction, ManifestTree } from '@umbraco-cms/models'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; export type ActionPageEntity = { key: string; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/context-menu/tree-context-menu-page-action-list.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/context-menu/tree-context-menu-page-action-list.element.ts index 6359e316e9..9ef5edbae1 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/context-menu/tree-context-menu-page-action-list.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/context-menu/tree-context-menu-page-action-list.element.ts @@ -5,7 +5,7 @@ import { map } from 'rxjs'; import { UmbSectionContext, UMB_SECTION_CONTEXT_TOKEN } from '../../section/section.context'; import type { Entity, ManifestTreeItemAction, ManifestTree } from '@umbraco-cms/models'; import { umbExtensionsRegistry } from '@umbraco-cms/extensions-registry'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; @customElement('umb-tree-context-menu-page-action-list') export class UmbTreeContextMenuPageActionListElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/context-menu/tree-context-menu-page.service.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/context-menu/tree-context-menu-page.service.ts index 84b821ce3a..36bcd4bc21 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/context-menu/tree-context-menu-page.service.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/context-menu/tree-context-menu-page.service.ts @@ -3,7 +3,7 @@ import { css, nothing, PropertyValueMap } from 'lit'; import { customElement, property, state } from 'lit/decorators.js'; import UmbTreeItemActionElement, { ActionPageEntity } from '../action/tree-item-action.element'; import { UmbTreeContextMenuService } from './tree-context-menu.service'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; import { UniqueBehaviorSubject } from '@umbraco-cms/observable-api'; import { UmbContextToken } from '@umbraco-cms/context-api'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/context-menu/tree-context-menu.service.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/context-menu/tree-context-menu.service.ts index aeb9fd2687..5b6e322682 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/context-menu/tree-context-menu.service.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/context-menu/tree-context-menu.service.ts @@ -2,7 +2,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css'; import { css, html, nothing } from 'lit'; import { customElement, state } from 'lit/decorators.js'; import { ActionPageEntity } from '../action/tree-item-action.element'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; import { UmbContextToken } from '@umbraco-cms/context-api'; @customElement('umb-tree-context-menu-service') diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/tree-item.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/tree-item.element.ts index e558638dce..9a565d115a 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/tree-item.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/tree-item.element.ts @@ -12,7 +12,7 @@ import { } from './context-menu/tree-context-menu.service'; import type { Entity } from '@umbraco-cms/models'; import type { UmbTreeDataStore } from '@umbraco-cms/store'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; import { umbExtensionsRegistry } from '@umbraco-cms/extensions-registry'; @customElement('umb-tree-item') diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/tree.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/tree.element.ts index ca6ae94497..552befc7e7 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/tree.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/tree.element.ts @@ -6,7 +6,7 @@ import { UmbTreeContextBase } from './tree.context'; import type { Entity, ManifestTree } from '@umbraco-cms/models'; import { umbExtensionsRegistry } from '@umbraco-cms/extensions-registry'; import { UmbTreeDataStore } from '@umbraco-cms/store'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; import './tree-item.element'; import './context-menu/tree-context-menu-page-action-list.element'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/variant-selector/variant-selector.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/variant-selector/variant-selector.element.ts index dea5781d6e..adc7588e89 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/variant-selector/variant-selector.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/variant-selector/variant-selector.element.ts @@ -7,7 +7,7 @@ import type { UmbWorkspaceContentContext } from '../workspace/workspace-content/ import type { DocumentDetails, MediaDetails } from '@umbraco-cms/models'; import type { UmbNodeStoreBase } from '@umbraco-cms/store'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; type ContentTypeTypes = DocumentDetails | MediaDetails; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace-property/workspace-property.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace-property/workspace-property.element.ts index a49120ef46..8a8945effb 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace-property/workspace-property.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace-property/workspace-property.element.ts @@ -10,7 +10,7 @@ import type { DataTypePropertyData, ManifestPropertyEditorUI, ManifestTypes } fr import '../../property-actions/shared/property-action-menu/property-action-menu.element'; import '../../../../backoffice/shared/components/workspace/workspace-property-layout/workspace-property-layout.element'; import { UmbObserverController } from '@umbraco-cms/observable-api'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; /** * @element umb-workspace-property diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/actions/save/workspace-action-node-save.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/actions/save/workspace-action-node-save.element.ts index bc1cb1b206..733eb1d661 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/actions/save/workspace-action-node-save.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/actions/save/workspace-action-node-save.element.ts @@ -3,7 +3,7 @@ import { customElement, state } from 'lit/decorators.js'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import type { UUIButtonState } from '@umbraco-ui/uui'; import { UmbWorkspaceContentContext } from '../../workspace-content/workspace-content.context'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; import type { ManifestWorkspaceAction } from '@umbraco-cms/models'; @customElement('umb-workspace-action-node-save') diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-content/views/collection/workspace-view-collection.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-content/views/collection/workspace-view-collection.element.ts index fd85d0103d..882dc1bdf9 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-content/views/collection/workspace-view-collection.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-content/views/collection/workspace-view-collection.element.ts @@ -11,7 +11,7 @@ import { UmbMediaStore, UmbMediaStoreItemType } from 'src/backoffice/media/media import '../../../../../../shared/components/content-property/content-property.element'; import '../../../../../../shared/collection/dashboards/dashboard-collection.element'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; @customElement('umb-workspace-view-collection') export class UmbWorkspaceViewCollectionElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-content/views/edit/workspace-view-content-edit.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-content/views/edit/workspace-view-content-edit.element.ts index fc45eed411..d10cf56215 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-content/views/edit/workspace-view-content-edit.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-content/views/edit/workspace-view-content-edit.element.ts @@ -7,7 +7,7 @@ import { UmbWorkspaceContentContext } from '../../workspace-content.context'; import type { ContentProperty, ContentPropertyData, DocumentDetails, MediaDetails } from '@umbraco-cms/models'; import '../../../../content-property/content-property.element'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; @customElement('umb-workspace-view-content-edit') export class UmbWorkspaceViewContentEditElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-content/views/info/workspace-view-content-info.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-content/views/info/workspace-view-content-info.element.ts index 30b3e98a61..ae148d8937 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-content/views/info/workspace-view-content-info.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-content/views/info/workspace-view-content-info.element.ts @@ -3,7 +3,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, state } from 'lit/decorators.js'; import type { UmbWorkspaceContentContext } from '../../workspace-content.context'; import type { DocumentDetails, MediaDetails } from '@umbraco-cms/models'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; @customElement('umb-workspace-view-content-info') export class UmbWorkspaceViewContentInfoElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-content/workspace-content.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-content/workspace-content.element.ts index 36cc76df03..0593b4ae60 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-content/workspace-content.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-content/workspace-content.element.ts @@ -9,13 +9,13 @@ import '../../variant-selector/variant-selector.element'; // TODO: Make this dynamic, use load-extensions method to loop over extensions for this node. import './views/edit/workspace-view-content-edit.element'; import './views/info/workspace-view-content-info.element'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; /** * TODO: IMPORTANT TODO: Get rid of the content workspace. Instead we aim to get separate components that can be composed by each workspace. * Example. Document Workspace would use a Variant-component(variant component would talk directly to the workspace-context) * As well breadcrumbs etc. - * + * */ @customElement('umb-workspace-content') export class UmbWorkspaceContentElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-layout/workspace-layout.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-layout/workspace-layout.element.ts index 117ce340b5..72917fb40d 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-layout/workspace-layout.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-layout/workspace-layout.element.ts @@ -6,15 +6,11 @@ import { map } from 'rxjs'; import { createExtensionElement } from '@umbraco-cms/extensions-api'; import { umbExtensionsRegistry } from '@umbraco-cms/extensions-registry'; -import type { - ManifestWorkspaceAction, - ManifestWorkspaceView, - ManifestWorkspaceViewCollection, -} from '@umbraco-cms/models'; +import type { ManifestWorkspaceAction, ManifestWorkspaceView, ManifestWorkspaceViewCollection } from '@umbraco-cms/models'; import '../../body-layout/body-layout.element'; import '../../extension-slot/extension-slot.element'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; /** * @element umb-workspace-layout @@ -50,7 +46,7 @@ export class UmbWorkspaceLayout extends UmbLitElement { } router-slot { height: 100%; - flex: 0; + flex:0; } umb-extension-slot[slot='actions'] { @@ -97,7 +93,11 @@ export class UmbWorkspaceLayout extends UmbLitElement { this.observe( umbExtensionsRegistry .extensionsOfTypes(['workspaceView', 'workspaceViewCollection']) - .pipe(map((extensions) => extensions.filter((extension) => extension.meta.workspaces.includes(this.alias)))), + .pipe( + map((extensions) => + extensions.filter((extension) => (extension).meta.workspaces.includes(this.alias)) + ) + ), (workspaceViews) => { this._workspaceViews = workspaceViews; this._createRoutes(); @@ -106,9 +106,11 @@ export class UmbWorkspaceLayout extends UmbLitElement { } private async _createRoutes() { + this._routes = []; if (this._workspaceViews.length > 0) { + this._routes = this._workspaceViews.map((view) => { return { path: `view/${view.meta.pathname}`, @@ -186,8 +188,7 @@ export class UmbWorkspaceLayout extends UmbLitElement { - extension.meta.workspaces.includes(this.alias)}> + .filter=${(extension: ManifestWorkspaceAction) => extension.meta.workspaces.includes(this.alias)}> `; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-actions/clear/property-action-clear.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-actions/clear/property-action-clear.element.ts index 8ec669f0e6..6df5a91cc9 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-actions/clear/property-action-clear.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-actions/clear/property-action-clear.element.ts @@ -3,10 +3,11 @@ import { customElement, property } from 'lit/decorators.js'; //import type { UmbPropertyActionMenuContext } from '../shared/property-action-menu/property-action-menu.context'; import { UmbPropertyAction } from '../shared/property-action/property-action.model'; import type { UmbWorkspacePropertyContext } from '../../components/workspace-property/workspace-property.context'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; @customElement('umb-property-action-clear') export class UmbPropertyActionClearElement extends UmbLitElement implements UmbPropertyAction { + @property() value = ''; @@ -39,7 +40,7 @@ export class UmbPropertyActionClearElement extends UmbLitElement implements UmbP //this.value = '';// This is though bad as it assumes we are dealing with a string. So wouldn't work as a generalized element. //this.dispatchEvent(new CustomEvent('property-value-change')); // Or you can do this: - this._propertyContext?.resetValue(); // This resets value to what the property wants. + this._propertyContext?.resetValue();// This resets value to what the property wants. } render() { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-actions/copy/property-action-copy.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-actions/copy/property-action-copy.element.ts index 72b565ea7b..6e9a1db8c1 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-actions/copy/property-action-copy.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-actions/copy/property-action-copy.element.ts @@ -6,7 +6,7 @@ import { UmbNotificationService, UMB_NOTIFICATION_SERVICE_CONTEXT_TOKEN, } from '@umbraco-cms/notification'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; @customElement('umb-property-action-copy') export class UmbPropertyActionCopyElement extends UmbLitElement implements UmbPropertyAction { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-actions/shared/property-action-menu/property-action-menu.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-actions/shared/property-action-menu/property-action-menu.element.ts index 6798cbceae..6898826005 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-actions/shared/property-action-menu/property-action-menu.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-actions/shared/property-action-menu/property-action-menu.element.ts @@ -7,7 +7,7 @@ import type { ManifestPropertyAction } from '@umbraco-cms/models'; import { umbExtensionsRegistry } from '@umbraco-cms/extensions-registry'; import '../property-action/property-action.element'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; import { UmbObserverController } from '@umbraco-cms/observable-api'; @customElement('umb-property-action-menu') @@ -41,6 +41,8 @@ export class UmbPropertyActionMenuElement extends UmbLitElement { `, ]; + + // TODO: we need to investigate context api vs values props and events @property() public value?: string; @@ -76,11 +78,16 @@ export class UmbPropertyActionMenuElement extends UmbLitElement { private _observeActions(alias: string) { this._actionsObserver?.destroy(); this._actionsObserver = this.observe( - umbExtensionsRegistry.extensionsOfType('propertyAction').pipe( - map((propertyActions) => { - return propertyActions.filter((propertyAction) => propertyAction.meta.propertyEditors.includes(alias)); - }) - ), + umbExtensionsRegistry + .extensionsOfType('propertyAction') + .pipe( + map((propertyActions) => { + return propertyActions.filter((propertyAction) => + propertyAction.meta.propertyEditors.includes(alias) + ) + } + ) + ), (manifests) => { this._actions = manifests; } @@ -97,28 +104,28 @@ export class UmbPropertyActionMenuElement extends UmbLitElement { } render() { - return this._actions.length > 0 - ? html` - - - - + return (this._actions.length > 0) ? + html` + + + + - - - ` + + + ` : ''; } } diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/shared/property-editor-config/property-editor-config.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/shared/property-editor-config/property-editor-config.element.ts index 61849e35f9..216e33b789 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/shared/property-editor-config/property-editor-config.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/shared/property-editor-config/property-editor-config.element.ts @@ -6,7 +6,7 @@ import type { PropertyEditorConfigDefaultData, PropertyEditorConfigProperty } fr import { umbExtensionsRegistry } from '@umbraco-cms/extensions-registry'; import '../../../components/workspace-property/workspace-property.element'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; /** * @element umb-property-editor-config @@ -58,30 +58,24 @@ export class UmbPropertyEditorConfigElement extends UmbLitElement { private _observePropertyEditorUIConfig() { if (!this._propertyEditorUIAlias) return; - this.observe( - umbExtensionsRegistry.getByTypeAndAlias('propertyEditorUI', this.propertyEditorUIAlias), - (manifest) => { - this._observePropertyEditorModelConfig(manifest?.meta.propertyEditorModel); - this._propertyEditorUIConfigProperties = manifest?.meta.config?.properties || []; - this._propertyEditorUIConfigDefaultData = manifest?.meta.config?.defaultData || []; - this._mergeConfigProperties(); - this._mergeConfigDefaultData(); - } - ); + this.observe(umbExtensionsRegistry.getByTypeAndAlias('propertyEditorUI', this.propertyEditorUIAlias), (manifest) => { + this._observePropertyEditorModelConfig(manifest?.meta.propertyEditorModel); + this._propertyEditorUIConfigProperties = manifest?.meta.config?.properties || []; + this._propertyEditorUIConfigDefaultData = manifest?.meta.config?.defaultData || []; + this._mergeConfigProperties(); + this._mergeConfigDefaultData(); + }); } private _observePropertyEditorModelConfig(propertyEditorModelAlias?: string) { if (!propertyEditorModelAlias) return; - this.observe( - umbExtensionsRegistry.getByTypeAndAlias('propertyEditorModel', propertyEditorModelAlias), - (manifest) => { - this._propertyEditorModelConfigProperties = manifest?.meta.config?.properties || []; - this._propertyEditorModelConfigDefaultData = manifest?.meta.config?.defaultData || []; - this._mergeConfigProperties(); - this._mergeConfigDefaultData(); - } - ); + this.observe(umbExtensionsRegistry.getByTypeAndAlias('propertyEditorModel', propertyEditorModelAlias), (manifest) => { + this._propertyEditorModelConfigProperties = manifest?.meta.config?.properties || []; + this._propertyEditorModelConfigDefaultData = manifest?.meta.config?.defaultData || []; + this._mergeConfigProperties(); + this._mergeConfigDefaultData(); + }); } private _mergeConfigProperties() { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-grid/config/block-configuration/property-editor-ui-block-grid-block-configuration.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-grid/config/block-configuration/property-editor-ui-block-grid-block-configuration.element.ts index 94ad826989..b1a5a2de20 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-grid/config/block-configuration/property-editor-ui-block-grid-block-configuration.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-grid/config/block-configuration/property-editor-ui-block-grid-block-configuration.element.ts @@ -1,7 +1,7 @@ import { html } from 'lit'; import { customElement, property } from 'lit/decorators.js'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; /** * @element umb-property-editor-ui-block-grid-block-configuration diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-grid/config/group-configuration/property-editor-ui-block-grid-group-configuration.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-grid/config/group-configuration/property-editor-ui-block-grid-group-configuration.element.ts index 6e91030494..4c3af973a9 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-grid/config/group-configuration/property-editor-ui-block-grid-group-configuration.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-grid/config/group-configuration/property-editor-ui-block-grid-group-configuration.element.ts @@ -1,7 +1,7 @@ import { html } from 'lit'; import { customElement, property } from 'lit/decorators.js'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; /** * @element umb-property-editor-ui-block-grid-group-configuration diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-grid/config/stylesheet-picker/property-editor-ui-block-grid-stylesheet-picker.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-grid/config/stylesheet-picker/property-editor-ui-block-grid-stylesheet-picker.element.ts index 3d438018eb..d9e73c661b 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-grid/config/stylesheet-picker/property-editor-ui-block-grid-stylesheet-picker.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-grid/config/stylesheet-picker/property-editor-ui-block-grid-stylesheet-picker.element.ts @@ -1,7 +1,7 @@ import { html } from 'lit'; import { customElement, property } from 'lit/decorators.js'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; /** * @element umb-property-editor-ui-block-grid-stylesheet-picker diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-grid/property-editor-ui-block-grid.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-grid/property-editor-ui-block-grid.element.ts index 62eb2dbf6f..7325189bc8 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-grid/property-editor-ui-block-grid.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-grid/property-editor-ui-block-grid.element.ts @@ -1,7 +1,7 @@ import { html } from 'lit'; import { customElement, property } from 'lit/decorators.js'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; /** * @element umb-property-editor-ui-block-grid diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-list/config/block-configuration/property-editor-ui-block-list-block-configuration.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-list/config/block-configuration/property-editor-ui-block-list-block-configuration.element.ts index 46fc05bc59..f08fd1694d 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-list/config/block-configuration/property-editor-ui-block-list-block-configuration.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-list/config/block-configuration/property-editor-ui-block-list-block-configuration.element.ts @@ -1,7 +1,7 @@ import { html } from 'lit'; import { customElement, property } from 'lit/decorators.js'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; /** * @element umb-property-editor-ui-block-list-block-configuration diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-list/property-editor-ui-block-list.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-list/property-editor-ui-block-list.element.ts index 1cff28af61..8af4f0bd49 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-list/property-editor-ui-block-list.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/block-list/property-editor-ui-block-list.element.ts @@ -1,7 +1,7 @@ import { html } from 'lit'; import { customElement, property } from 'lit/decorators.js'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; /** * @element umb-property-editor-ui-block-list diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/checkbox-list/property-editor-ui-checkbox-list.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/checkbox-list/property-editor-ui-checkbox-list.element.ts index 7779226bf1..0c501fc88b 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/checkbox-list/property-editor-ui-checkbox-list.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/checkbox-list/property-editor-ui-checkbox-list.element.ts @@ -1,7 +1,7 @@ import { html } from 'lit'; import { customElement, property } from 'lit/decorators.js'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; /** * @element umb-property-editor-ui-checkbox-list diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/collection-view/config/bulk-action-permissions/property-editor-ui-collection-view-bulk-action-permissions.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/collection-view/config/bulk-action-permissions/property-editor-ui-collection-view-bulk-action-permissions.element.ts index 3e916db439..f1ea228ed3 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/collection-view/config/bulk-action-permissions/property-editor-ui-collection-view-bulk-action-permissions.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/collection-view/config/bulk-action-permissions/property-editor-ui-collection-view-bulk-action-permissions.element.ts @@ -1,7 +1,7 @@ import { html } from 'lit'; import { customElement, property } from 'lit/decorators.js'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; /** * @element umb-property-editor-ui-collection-view-bulk-action-permissions diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/collection-view/config/column-configuration/property-editor-ui-collection-view-column-configuration.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/collection-view/config/column-configuration/property-editor-ui-collection-view-column-configuration.element.ts index df9604b90c..e5483e4fe0 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/collection-view/config/column-configuration/property-editor-ui-collection-view-column-configuration.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/collection-view/config/column-configuration/property-editor-ui-collection-view-column-configuration.element.ts @@ -1,7 +1,7 @@ import { html } from 'lit'; import { customElement, property } from 'lit/decorators.js'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; /** * @element umb-property-editor-ui-collection-view-column-configuration diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/collection-view/config/layout-configuration/property-editor-ui-collection-view-layout-configuration.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/collection-view/config/layout-configuration/property-editor-ui-collection-view-layout-configuration.element.ts index d368c071fb..90febd1e3f 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/collection-view/config/layout-configuration/property-editor-ui-collection-view-layout-configuration.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/collection-view/config/layout-configuration/property-editor-ui-collection-view-layout-configuration.element.ts @@ -1,7 +1,7 @@ import { html } from 'lit'; import { customElement, property } from 'lit/decorators.js'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; /** * @element umb-property-editor-ui-collection-view-layout-configuration diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/collection-view/config/order-by/property-editor-ui-collection-view-order-by.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/collection-view/config/order-by/property-editor-ui-collection-view-order-by.element.ts index 203d97b040..6ea8a17e1c 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/collection-view/config/order-by/property-editor-ui-collection-view-order-by.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/collection-view/config/order-by/property-editor-ui-collection-view-order-by.element.ts @@ -1,7 +1,7 @@ import { html } from 'lit'; import { customElement, property } from 'lit/decorators.js'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; /** * @element umb-property-editor-ui-collection-view-order-by diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/collection-view/property-editor-ui-collection-view.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/collection-view/property-editor-ui-collection-view.element.ts index f393236675..02d402ff81 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/collection-view/property-editor-ui-collection-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/collection-view/property-editor-ui-collection-view.element.ts @@ -1,7 +1,7 @@ import { html } from 'lit'; import { customElement, property } from 'lit/decorators.js'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; /** * @element umb-property-editor-ui-collection-view diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/color-picker/property-editor-ui-color-picker.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/color-picker/property-editor-ui-color-picker.element.ts index 68b07d02c4..c50a458514 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/color-picker/property-editor-ui-color-picker.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/color-picker/property-editor-ui-color-picker.element.ts @@ -1,7 +1,7 @@ import { html } from 'lit'; import { customElement, property } from 'lit/decorators.js'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; /** * @element umb-property-editor-ui-color-picker diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/date-picker/property-editor-ui-date-picker.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/date-picker/property-editor-ui-date-picker.element.ts index 628e669e7f..3ebaf9d8a0 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/date-picker/property-editor-ui-date-picker.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/date-picker/property-editor-ui-date-picker.element.ts @@ -1,7 +1,7 @@ import { html } from 'lit'; import { customElement, property } from 'lit/decorators.js'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; /** * @element umb-property-editor-ui-date-picker diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/document-picker/property-editor-ui-document-picker.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/document-picker/property-editor-ui-document-picker.element.ts index 9f4ef96bc2..13254a1cf4 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/document-picker/property-editor-ui-document-picker.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/document-picker/property-editor-ui-document-picker.element.ts @@ -1,6 +1,6 @@ import { html } from 'lit'; import { customElement, property, state } from 'lit/decorators.js'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; import type { UmbInputDocumentPickerElement } from 'src/backoffice/shared/components/input-document-picker/input-document-picker.element'; import '../../../components/input-document-picker/input-document-picker.element'; import type { DataTypePropertyData } from '@umbraco-cms/models'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/dropdown/property-editor-ui-dropdown.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/dropdown/property-editor-ui-dropdown.element.ts index b6ebba7082..7020970027 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/dropdown/property-editor-ui-dropdown.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/dropdown/property-editor-ui-dropdown.element.ts @@ -1,7 +1,7 @@ import { html } from 'lit'; import { customElement, property } from 'lit/decorators.js'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; /** * @element umb-property-editor-ui-dropdown diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/eye-dropper/property-editor-ui-eye-dropper.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/eye-dropper/property-editor-ui-eye-dropper.element.ts index a89d2167d4..42a01d4448 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/eye-dropper/property-editor-ui-eye-dropper.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/eye-dropper/property-editor-ui-eye-dropper.element.ts @@ -1,7 +1,7 @@ import { html } from 'lit'; import { customElement, property } from 'lit/decorators.js'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; /** * @element umb-property-editor-ui-eye-dropper diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/icon-picker/property-editor-ui-icon-picker.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/icon-picker/property-editor-ui-icon-picker.element.ts index 746caf614b..32cc9d951d 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/icon-picker/property-editor-ui-icon-picker.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/icon-picker/property-editor-ui-icon-picker.element.ts @@ -2,7 +2,7 @@ import { html } from 'lit'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, property } from 'lit/decorators.js'; import { UmbModalService, UMB_MODAL_SERVICE_CONTEXT_TOKEN } from '../../../../../core/modal'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; /** * @element umb-property-editor-ui-icon-picker diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/image-cropper/property-editor-ui-image-cropper.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/image-cropper/property-editor-ui-image-cropper.element.ts index 729958b764..88b08bbf7e 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/image-cropper/property-editor-ui-image-cropper.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/image-cropper/property-editor-ui-image-cropper.element.ts @@ -1,7 +1,7 @@ import { html } from 'lit'; import { customElement, property } from 'lit/decorators.js'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; /** * @element umb-property-editor-ui-image-cropper diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/image-crops-configuration/property-editor-ui-image-crops-configuration.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/image-crops-configuration/property-editor-ui-image-crops-configuration.element.ts index 453940d837..f9ef77f241 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/image-crops-configuration/property-editor-ui-image-crops-configuration.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/image-crops-configuration/property-editor-ui-image-crops-configuration.element.ts @@ -1,7 +1,7 @@ import { html } from 'lit'; import { customElement, property } from 'lit/decorators.js'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; /** * @element umb-property-editor-ui-image-crops-configuration diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/label/property-editor-ui-label.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/label/property-editor-ui-label.element.ts index 7bad98757e..59e2a6f66e 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/label/property-editor-ui-label.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/label/property-editor-ui-label.element.ts @@ -1,7 +1,7 @@ import { html } from 'lit'; import { customElement, property } from 'lit/decorators.js'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; /** * @element umb-property-editor-ui-label diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/markdown-editor/property-editor-ui-markdown-editor.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/markdown-editor/property-editor-ui-markdown-editor.element.ts index 4bf0e6a0cf..d20b64e31c 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/markdown-editor/property-editor-ui-markdown-editor.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/markdown-editor/property-editor-ui-markdown-editor.element.ts @@ -1,7 +1,7 @@ import { html } from 'lit'; import { customElement, property } from 'lit/decorators.js'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; /** * @element umb-property-editor-ui-markdown-editor diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/media-picker/property-editor-ui-media-picker.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/media-picker/property-editor-ui-media-picker.element.ts index ac00b08123..b7c18cd63b 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/media-picker/property-editor-ui-media-picker.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/media-picker/property-editor-ui-media-picker.element.ts @@ -1,7 +1,7 @@ import { html } from 'lit'; import { customElement, property } from 'lit/decorators.js'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; /** * @element umb-property-editor-ui-media-picker diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/member-group-picker/property-editor-ui-member-group-picker.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/member-group-picker/property-editor-ui-member-group-picker.element.ts index 4ed449c6b1..6a851c6516 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/member-group-picker/property-editor-ui-member-group-picker.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/member-group-picker/property-editor-ui-member-group-picker.element.ts @@ -1,7 +1,7 @@ import { html } from 'lit'; import { customElement, property } from 'lit/decorators.js'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; /** * @element umb-property-editor-ui-member-group-picker diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/member-picker/property-editor-ui-member-picker.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/member-picker/property-editor-ui-member-picker.element.ts index 6916e7b73a..88d9b40f47 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/member-picker/property-editor-ui-member-picker.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/member-picker/property-editor-ui-member-picker.element.ts @@ -1,7 +1,7 @@ import { html } from 'lit'; import { customElement, property } from 'lit/decorators.js'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; /** * @element umb-property-editor-ui-member-picker diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/multi-url-picker/property-editor-ui-multi-url-picker.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/multi-url-picker/property-editor-ui-multi-url-picker.element.ts index fea30850b4..dd21df3e24 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/multi-url-picker/property-editor-ui-multi-url-picker.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/multi-url-picker/property-editor-ui-multi-url-picker.element.ts @@ -1,7 +1,7 @@ import { html } from 'lit'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, property } from 'lit/decorators.js'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; /** * @element umb-property-editor-ui-multi-url-picker diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/multiple-text-string/property-editor-ui-multiple-text-string.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/multiple-text-string/property-editor-ui-multiple-text-string.element.ts index 4985457537..b5e310d520 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/multiple-text-string/property-editor-ui-multiple-text-string.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/multiple-text-string/property-editor-ui-multiple-text-string.element.ts @@ -1,7 +1,7 @@ import { html } from 'lit'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, property } from 'lit/decorators.js'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; /** * @element umb-property-editor-ui-multiple-text-string diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/number-range/property-editor-ui-number-range.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/number-range/property-editor-ui-number-range.element.ts index d0725b5fcf..8c28876e9b 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/number-range/property-editor-ui-number-range.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/number-range/property-editor-ui-number-range.element.ts @@ -2,7 +2,7 @@ import { html } from 'lit'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, property, state } from 'lit/decorators.js'; import type { UmbInputNumberRangeElement } from '../../../../shared/components/input-number-range/input-number-range.element'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; import '../../../../shared/components/input-number-range/input-number-range.element'; type ValueType = { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/number/property-editor-ui-number.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/number/property-editor-ui-number.element.ts index 0ff3749174..84663ac489 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/number/property-editor-ui-number.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/number/property-editor-ui-number.element.ts @@ -1,7 +1,7 @@ import { css, html } from 'lit'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, property } from 'lit/decorators.js'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; @customElement('umb-property-editor-ui-number') export class UmbPropertyEditorUINumberElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/order-direction/property-editor-ui-order-direction.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/order-direction/property-editor-ui-order-direction.element.ts index 70ffcf11a7..6f99e11e43 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/order-direction/property-editor-ui-order-direction.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/order-direction/property-editor-ui-order-direction.element.ts @@ -1,7 +1,7 @@ import { html } from 'lit'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, property } from 'lit/decorators.js'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; /** * @element umb-property-editor-ui-order-direction diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/overlay-size/property-editor-ui-overlay-size.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/overlay-size/property-editor-ui-overlay-size.element.ts index 24e1feb0f9..68b6369670 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/overlay-size/property-editor-ui-overlay-size.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/overlay-size/property-editor-ui-overlay-size.element.ts @@ -1,7 +1,7 @@ import { html } from 'lit'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, property } from 'lit/decorators.js'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; /** * @element umb-property-editor-ui-overlay-size diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/radio-button-list/property-editor-ui-radio-button-list.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/radio-button-list/property-editor-ui-radio-button-list.element.ts index c090fd34ee..2718c7cc9a 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/radio-button-list/property-editor-ui-radio-button-list.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/radio-button-list/property-editor-ui-radio-button-list.element.ts @@ -1,7 +1,7 @@ import { html } from 'lit'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, property } from 'lit/decorators.js'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; /** * @element umb-property-editor-ui-radio-button-list diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/slider/property-editor-ui-slider.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/slider/property-editor-ui-slider.element.ts index 06246d269a..22e0bd368f 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/slider/property-editor-ui-slider.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/slider/property-editor-ui-slider.element.ts @@ -1,7 +1,7 @@ import { html } from 'lit'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, property } from 'lit/decorators.js'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; /** * @element umb-property-editor-ui-slider diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tags/config/storage-type/property-editor-ui-tags-storage-type.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tags/config/storage-type/property-editor-ui-tags-storage-type.element.ts index 1a0620d335..16804c091c 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tags/config/storage-type/property-editor-ui-tags-storage-type.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tags/config/storage-type/property-editor-ui-tags-storage-type.element.ts @@ -1,7 +1,7 @@ import { html } from 'lit'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, property } from 'lit/decorators.js'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; /** * @element umb-property-editor-ui-tags-storage-type diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tags/property-editor-ui-tags.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tags/property-editor-ui-tags.element.ts index 54fd339ab5..a7d922140f 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tags/property-editor-ui-tags.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tags/property-editor-ui-tags.element.ts @@ -1,7 +1,7 @@ import { html } from 'lit'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, property } from 'lit/decorators.js'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; /** * @element umb-property-editor-ui-tags diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/text-box/property-editor-ui-text-box.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/text-box/property-editor-ui-text-box.element.ts index 1af0133ae7..6ae4ce2284 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/text-box/property-editor-ui-text-box.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/text-box/property-editor-ui-text-box.element.ts @@ -1,7 +1,7 @@ import { css, html } from 'lit'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, property } from 'lit/decorators.js'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; @customElement('umb-property-editor-ui-text-box') export class UmbPropertyEditorUITextBoxElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/textarea/property-editor-ui-textarea.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/textarea/property-editor-ui-textarea.element.ts index 450e93b422..df1980458f 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/textarea/property-editor-ui-textarea.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/textarea/property-editor-ui-textarea.element.ts @@ -2,7 +2,7 @@ import { css, html } from 'lit'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, property } from 'lit/decorators.js'; import type { UmbWorkspacePropertyContext } from 'src/backoffice/shared/components/workspace-property/workspace-property.context'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; import { UUITextareaElement } from '@umbraco-ui/uui'; @customElement('umb-property-editor-ui-textarea') @@ -38,7 +38,8 @@ export class UmbPropertyEditorUITextareaElement extends UmbLitElement { } render() { - return html` `; + return html` + `; } } diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tiny-mce/config/configuration/property-editor-ui-tiny-mce-configuration.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tiny-mce/config/configuration/property-editor-ui-tiny-mce-configuration.element.ts index b3707983f9..82fa2edbd1 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tiny-mce/config/configuration/property-editor-ui-tiny-mce-configuration.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tiny-mce/config/configuration/property-editor-ui-tiny-mce-configuration.element.ts @@ -1,7 +1,7 @@ import { html } from 'lit'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, property } from 'lit/decorators.js'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; /** * @element umb-property-editor-ui-tiny-mce-configuration diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tiny-mce/property-editor-ui-tiny-mce.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tiny-mce/property-editor-ui-tiny-mce.element.ts index f5d5f20149..627563c013 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tiny-mce/property-editor-ui-tiny-mce.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tiny-mce/property-editor-ui-tiny-mce.element.ts @@ -1,7 +1,7 @@ import { html } from 'lit'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, property } from 'lit/decorators.js'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; /** * @element umb-property-editor-ui-tiny-mce diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/toggle/property-editor-ui-toggle.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/toggle/property-editor-ui-toggle.element.ts index c1fe9e4a56..4243ab52ef 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/toggle/property-editor-ui-toggle.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/toggle/property-editor-ui-toggle.element.ts @@ -1,7 +1,7 @@ import { html } from 'lit'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, property } from 'lit/decorators.js'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; /** * @element umb-property-editor-ui-toggle diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tree-picker/config/start-node/property-editor-ui-tree-picker-start-node.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tree-picker/config/start-node/property-editor-ui-tree-picker-start-node.element.ts index 29c9424e36..5975246ffe 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tree-picker/config/start-node/property-editor-ui-tree-picker-start-node.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tree-picker/config/start-node/property-editor-ui-tree-picker-start-node.element.ts @@ -1,7 +1,7 @@ import { html } from 'lit'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, property } from 'lit/decorators.js'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; /** * @element umb-property-editor-ui-tree-picker-start-node diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tree-picker/property-editor-ui-tree-picker.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tree-picker/property-editor-ui-tree-picker.element.ts index de643068d6..909cd79323 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tree-picker/property-editor-ui-tree-picker.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tree-picker/property-editor-ui-tree-picker.element.ts @@ -1,7 +1,7 @@ import { html } from 'lit'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, property } from 'lit/decorators.js'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; /** * @element umb-property-editor-ui-tree-picker diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/upload-field/property-editor-ui-upload-field.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/upload-field/property-editor-ui-upload-field.element.ts index ad9735bc10..9687e6838c 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/upload-field/property-editor-ui-upload-field.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/upload-field/property-editor-ui-upload-field.element.ts @@ -1,7 +1,7 @@ import { html } from 'lit'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, property } from 'lit/decorators.js'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; /** * @element umb-property-editor-ui-upload-field diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/user-picker/property-editor-ui-user-picker.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/user-picker/property-editor-ui-user-picker.element.ts index 6dd95a872b..a66647915e 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/user-picker/property-editor-ui-user-picker.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/user-picker/property-editor-ui-user-picker.element.ts @@ -1,7 +1,7 @@ import { html } from 'lit'; import { customElement, property } from 'lit/decorators.js'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; /** * @element umb-property-editor-ui-user-picker diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/value-type/property-editor-ui-value-type.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/value-type/property-editor-ui-value-type.element.ts index 25a73e74e8..341b8e274c 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/value-type/property-editor-ui-value-type.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/value-type/property-editor-ui-value-type.element.ts @@ -1,7 +1,7 @@ import { html } from 'lit'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, property } from 'lit/decorators.js'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; /** * @element umb-property-editor-ui-value-type diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/sidebar-menu-item/dictionary-sidebar-menu-item.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/sidebar-menu-item/dictionary-sidebar-menu-item.element.ts index f742cffbcf..f06a051ad3 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/sidebar-menu-item/dictionary-sidebar-menu-item.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/sidebar-menu-item/dictionary-sidebar-menu-item.element.ts @@ -1,6 +1,6 @@ import { html } from 'lit'; import { customElement } from 'lit/decorators.js'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; @customElement('umb-dictionary-sidebar-menu-item') export class UmbDictionarySidebarMenuItemElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/current-user/current-user-header-app.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/current-user/current-user-header-app.element.ts index d5361ce93e..66f587fe86 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/users/current-user/current-user-header-app.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/current-user/current-user-header-app.element.ts @@ -4,7 +4,7 @@ import { customElement, state } from 'lit/decorators.js'; import { UmbCurrentUserStore, UMB_CURRENT_USER_STORE_CONTEXT_TOKEN } from './current-user.store'; import type { UserDetails } from '@umbraco-cms/models'; import { UmbModalService, UMB_MODAL_SERVICE_CONTEXT_TOKEN } from 'src/core/modal'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; @customElement('umb-current-user-header-app') export class UmbCurrentUserHeaderApp extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/current-user/user-dashboard-test.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/current-user/user-dashboard-test.element.ts index c9b1d5e737..e2db3b031e 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/users/current-user/user-dashboard-test.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/current-user/user-dashboard-test.element.ts @@ -1,7 +1,7 @@ import { css, html } from 'lit'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement } from 'lit/decorators.js'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; @customElement('umb-user-dashboard-test') export class UmbUserDashboardTestElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/user-groups/workspace/actions/workspace-action-user-group-save.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/user-groups/workspace/actions/workspace-action-user-group-save.element.ts index 622a9837c1..3977037d08 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/users/user-groups/workspace/actions/workspace-action-user-group-save.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/user-groups/workspace/actions/workspace-action-user-group-save.element.ts @@ -3,7 +3,7 @@ import { customElement, state } from 'lit/decorators.js'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import type { UUIButtonState } from '@umbraco-ui/uui'; import { UmbWorkspaceUserContext } from '../../../users/workspace/user-workspace.context'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; @customElement('umb-workspace-action-user-group-save') export class UmbWorkspaceActionUserGroupSaveElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/user-groups/workspace/user-group-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/user-groups/workspace/user-group-workspace.element.ts index fab2ea472f..0d3633cc10 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/users/user-groups/workspace/user-group-workspace.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/user-groups/workspace/user-group-workspace.element.ts @@ -11,7 +11,7 @@ import { UmbUserStore, UMB_USER_STORE_CONTEXT_TOKEN } from 'src/backoffice/users import '../../../../auth/components/input-user/input-user.element'; import '../../../../backoffice/shared/components/input-section/input-section.element'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; import { UmbWorkspaceEntityElement } from 'src/backoffice/shared/components/workspace/workspace-entity-element.interface'; @customElement('umb-user-group-workspace') diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/user-section/views/user-groups/user-group-table-sections-column-layout.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/user-section/views/user-groups/user-group-table-sections-column-layout.element.ts index a6f8f0f4ec..905a72a6aa 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/users/user-section/views/user-groups/user-group-table-sections-column-layout.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/user-section/views/user-groups/user-group-table-sections-column-layout.element.ts @@ -2,7 +2,7 @@ import { html } from 'lit'; import { customElement, property, state } from 'lit/decorators.js'; import { umbExtensionsRegistry } from '@umbraco-cms/extensions-registry'; import { UmbTableItem } from 'src/backoffice/shared/components/table'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; @customElement('umb-user-group-table-sections-column-layout') export class UmbUserGroupTableSectionsColumnLayoutElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/user-section/views/user-groups/workspace-view-user-groups.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/user-section/views/user-groups/workspace-view-user-groups.element.ts index 1d6670c474..9d3f8ac467 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/users/user-section/views/user-groups/workspace-view-user-groups.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/user-section/views/user-groups/workspace-view-user-groups.element.ts @@ -18,7 +18,7 @@ import { UmbUserGroupStore, UMB_USER_GROUP_STORE_CONTEXT_TOKEN, } from 'src/backoffice/users/user-groups/user-group.store'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; @customElement('umb-workspace-view-user-groups') export class UmbWorkspaceViewUserGroupsElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/user-section/views/users/list-view-layouts/grid/workspace-view-users-grid.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/user-section/views/users/list-view-layouts/grid/workspace-view-users-grid.element.ts index b6366eb0b6..45f52c2d8b 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/users/user-section/views/users/list-view-layouts/grid/workspace-view-users-grid.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/user-section/views/users/list-view-layouts/grid/workspace-view-users-grid.element.ts @@ -7,7 +7,7 @@ import type { UmbSectionViewUsersElement } from '../../section-view-users.elemen import { getTagLookAndColor } from '../../../../../../../auth/utils'; import { UmbUserGroupStore, UMB_USER_GROUP_STORE_CONTEXT_TOKEN } from '../../../../../user-groups/user-group.store'; import type { UserDetails, UserEntity, UserGroupEntity } from '@umbraco-cms/models'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; @customElement('umb-workspace-view-users-grid') export class UmbWorkspaceViewUsersGridElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/user-section/views/users/list-view-layouts/table/workspace-view-users-table.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/user-section/views/users/list-view-layouts/table/workspace-view-users-table.element.ts index 3158ab35da..bcd3ae99fd 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/users/user-section/views/users/list-view-layouts/table/workspace-view-users-table.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/user-section/views/users/list-view-layouts/table/workspace-view-users-table.element.ts @@ -19,7 +19,7 @@ import { UmbUserGroupStore, UMB_USER_GROUP_STORE_CONTEXT_TOKEN, } from 'src/backoffice/users/user-groups/user-group.store'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; @customElement('umb-workspace-view-users-table') export class UmbWorkspaceViewUsersTableElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/user-section/views/users/section-view-users.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/user-section/views/users/section-view-users.element.ts index add11760da..01eaac240a 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/users/user-section/views/users/section-view-users.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/user-section/views/users/section-view-users.element.ts @@ -11,7 +11,7 @@ import './workspace-view-users-invite.element'; import type { ManifestWorkspace, UserDetails } from '@umbraco-cms/models'; import { UmbUserStore, UMB_USER_STORE_CONTEXT_TOKEN } from 'src/backoffice/users/users/user.store'; import { createExtensionElement } from '@umbraco-cms/extensions-api'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; import { UniqueBehaviorSubject } from '@umbraco-cms/observable-api'; @customElement('umb-section-view-users') diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/user-section/views/users/workspace-view-users-overview.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/user-section/views/users/workspace-view-users-overview.element.ts index 459cb8ea5a..1cf7e2456e 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/users/user-section/views/users/workspace-view-users-overview.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/user-section/views/users/workspace-view-users-overview.element.ts @@ -5,7 +5,7 @@ import { IRoute } from 'router-slot'; import { UUIPopoverElement } from '@umbraco-ui/uui'; import type { UmbSectionViewUsersElement } from './section-view-users.element'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; import { UmbModalService, UMB_MODAL_SERVICE_CONTEXT_TOKEN } from 'src/core/modal'; import './list-view-layouts/table/workspace-view-users-table.element'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/user-section/views/users/workspace-view-users-selection.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/user-section/views/users/workspace-view-users-selection.element.ts index 543343e88d..9de0d77569 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/users/user-section/views/users/workspace-view-users-selection.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/user-section/views/users/workspace-view-users-selection.element.ts @@ -3,7 +3,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, state } from 'lit/decorators.js'; import { UmbSectionViewUsersElement } from './section-view-users.element'; import { UmbUserStore, UMB_USER_STORE_CONTEXT_TOKEN } from 'src/backoffice/users/users/user.store'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; @customElement('umb-workspace-view-users-selection') export class UmbWorkspaceViewUsersSelectionElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/users/workspace/actions/workspace-action-user-save.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/users/workspace/actions/workspace-action-user-save.element.ts index fef51dc093..000e11c34d 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/users/users/workspace/actions/workspace-action-user-save.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/users/workspace/actions/workspace-action-user-save.element.ts @@ -3,7 +3,7 @@ import { customElement, state } from 'lit/decorators.js'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import type { UUIButtonState } from '@umbraco-ui/uui'; import { UmbWorkspaceUserContext } from '../user-workspace.context'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; @customElement('umb-workspace-action-user-save') export class UmbWorkspaceActionUserSaveElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/users/workspace/user-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/users/workspace/user-workspace.element.ts index 3e0327ebee..ee0e0b5e14 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/users/users/workspace/user-workspace.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/users/workspace/user-workspace.element.ts @@ -17,7 +17,7 @@ import { UmbModalService } from 'src/core/modal'; import '../../../../auth/components/input-user-group/input-user-group.element'; import '../../../shared/property-editors/uis/document-picker/property-editor-ui-document-picker.element'; import '../../../shared/components/workspace/workspace-layout/workspace-layout.element'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; import type { UmbWorkspaceEntityElement } from 'src/backoffice/shared/components/workspace/workspace-entity-element.interface'; @customElement('umb-user-workspace') diff --git a/src/Umbraco.Web.UI.Client/src/core/modal/layouts/modal-layout-change-password.element.ts b/src/Umbraco.Web.UI.Client/src/core/modal/layouts/modal-layout-change-password.element.ts index a23237b36b..927af7e900 100644 --- a/src/Umbraco.Web.UI.Client/src/core/modal/layouts/modal-layout-change-password.element.ts +++ b/src/Umbraco.Web.UI.Client/src/core/modal/layouts/modal-layout-change-password.element.ts @@ -2,7 +2,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { css, CSSResultGroup, html, nothing } from 'lit'; import { customElement, property } from 'lit/decorators.js'; import { UmbModalHandler } from '..'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; export interface UmbModalChangePasswordData { requireOldPassword: boolean; diff --git a/src/Umbraco.Web.UI.Client/src/core/modal/layouts/modal-layout-current-user.element.ts b/src/Umbraco.Web.UI.Client/src/core/modal/layouts/modal-layout-current-user.element.ts index dca35d4378..0bfba481a9 100644 --- a/src/Umbraco.Web.UI.Client/src/core/modal/layouts/modal-layout-current-user.element.ts +++ b/src/Umbraco.Web.UI.Client/src/core/modal/layouts/modal-layout-current-user.element.ts @@ -12,7 +12,7 @@ import { UMB_CURRENT_USER_STORE_CONTEXT_TOKEN, } from '../../../backoffice/users/current-user/current-user.store'; import type { UserDetails } from '@umbraco-cms/models'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; @customElement('umb-modal-layout-current-user') export class UmbModalLayoutCurrentUserElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/core/modal/layouts/modal-layout.element.ts b/src/Umbraco.Web.UI.Client/src/core/modal/layouts/modal-layout.element.ts index 6bb93b5110..bf28bcae3a 100644 --- a/src/Umbraco.Web.UI.Client/src/core/modal/layouts/modal-layout.element.ts +++ b/src/Umbraco.Web.UI.Client/src/core/modal/layouts/modal-layout.element.ts @@ -1,6 +1,6 @@ import { customElement, property } from 'lit/decorators.js'; import { UmbModalHandler } from '..'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; @customElement('umb-modal-layout') export class UmbModalLayoutElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/core/modal/layouts/property-editor-ui-picker/modal-layout-property-editor-ui-picker.element.ts b/src/Umbraco.Web.UI.Client/src/core/modal/layouts/property-editor-ui-picker/modal-layout-property-editor-ui-picker.element.ts index f3b5344a78..fc1a76799d 100644 --- a/src/Umbraco.Web.UI.Client/src/core/modal/layouts/property-editor-ui-picker/modal-layout-property-editor-ui-picker.element.ts +++ b/src/Umbraco.Web.UI.Client/src/core/modal/layouts/property-editor-ui-picker/modal-layout-property-editor-ui-picker.element.ts @@ -7,7 +7,7 @@ import type { UUIInputEvent } from '@umbraco-ui/uui'; import type { UmbModalHandler } from '../../modal-handler'; import type { ManifestPropertyEditorUI } from '@umbraco-cms/models'; import { umbExtensionsRegistry } from '@umbraco-cms/extensions-registry'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; export interface UmbModalPropertyEditorUIPickerData { selection?: Array; diff --git a/src/Umbraco.Web.UI.Client/src/core/modal/modal.stories.mdx b/src/Umbraco.Web.UI.Client/src/core/modal/modal.stories.mdx index 8d9b279d47..69ad42fa30 100644 --- a/src/Umbraco.Web.UI.Client/src/core/modal/modal.stories.mdx +++ b/src/Umbraco.Web.UI.Client/src/core/modal/modal.stories.mdx @@ -24,7 +24,7 @@ The UmbModal service can be used to open modals. ```ts import { html, LitElement } from 'lit'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; import { UmbModalService, UMB_MODAL_SERVICE_CONTEXT_ALIAS } from './core/services/modal'; class MyElement extends UmbLitElement { private _modalService_?: UmbModalService; @@ -44,7 +44,7 @@ A modal is opened by calling one of the helper methods on the UmbModalService. T ```ts import { html, LitElement } from 'lit'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; import { UmbModalService, UMB_MODAL_SERVICE_CONTEXT_ALIAS } from './core/services/modal'; class MyElement extends UmbLitElement { private _modalService?: UmbModalService; diff --git a/src/Umbraco.Web.UI.Client/src/core/modal/modal.stories.ts b/src/Umbraco.Web.UI.Client/src/core/modal/modal.stories.ts index ee4d3174ab..0454bcf94e 100644 --- a/src/Umbraco.Web.UI.Client/src/core/modal/modal.stories.ts +++ b/src/Umbraco.Web.UI.Client/src/core/modal/modal.stories.ts @@ -3,7 +3,7 @@ import { html } from 'lit-html'; import { customElement, property, state } from 'lit/decorators.js'; import { UmbModalService, UMB_MODAL_SERVICE_CONTEXT_TOKEN } from '.'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; export default { title: 'API/Modals', diff --git a/src/Umbraco.Web.UI.Client/src/installer/consent/installer-consent.element.ts b/src/Umbraco.Web.UI.Client/src/installer/consent/installer-consent.element.ts index cba9b5707e..ae2c08282e 100644 --- a/src/Umbraco.Web.UI.Client/src/installer/consent/installer-consent.element.ts +++ b/src/Umbraco.Web.UI.Client/src/installer/consent/installer-consent.element.ts @@ -4,7 +4,7 @@ import { unsafeHTML } from 'lit/directives/unsafe-html.js'; import { UmbInstallerContext, UMB_INSTALLER_CONTEXT_TOKEN } from '../installer.context'; import { ConsentLevel, Telemetry, TelemetryLevel } from '@umbraco-cms/backend-api'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; @customElement('umb-installer-consent') export class UmbInstallerConsentElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/installer/database/installer-database.element.ts b/src/Umbraco.Web.UI.Client/src/installer/database/installer-database.element.ts index 48eeb7596d..9f1229ac85 100644 --- a/src/Umbraco.Web.UI.Client/src/installer/database/installer-database.element.ts +++ b/src/Umbraco.Web.UI.Client/src/installer/database/installer-database.element.ts @@ -4,7 +4,7 @@ import { customElement, property, query, state } from 'lit/decorators.js'; import { UmbInstallerContext, UMB_INSTALLER_CONTEXT_TOKEN } from '../installer.context'; import { DatabaseInstall, DatabaseSettings, InstallResource, ProblemDetails } from '@umbraco-cms/backend-api'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; import { tryExecute } from '@umbraco-cms/resources'; @customElement('umb-installer-database') diff --git a/src/Umbraco.Web.UI.Client/src/installer/error/installer-error.element.ts b/src/Umbraco.Web.UI.Client/src/installer/error/installer-error.element.ts index 3d7de0e110..181b63e20c 100644 --- a/src/Umbraco.Web.UI.Client/src/installer/error/installer-error.element.ts +++ b/src/Umbraco.Web.UI.Client/src/installer/error/installer-error.element.ts @@ -3,7 +3,7 @@ import { customElement, state } from 'lit/decorators.js'; import { UmbInstallerContext, UMB_INSTALLER_CONTEXT_TOKEN } from '../installer.context'; import { ProblemDetails } from '@umbraco-cms/backend-api'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; @customElement('umb-installer-error') export class UmbInstallerErrorElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/installer/installer.element.ts b/src/Umbraco.Web.UI.Client/src/installer/installer.element.ts index 2a18296ad6..3b5b64cd64 100644 --- a/src/Umbraco.Web.UI.Client/src/installer/installer.element.ts +++ b/src/Umbraco.Web.UI.Client/src/installer/installer.element.ts @@ -1,7 +1,7 @@ import { css, CSSResultGroup, html } from 'lit'; import { customElement, state } from 'lit/decorators.js'; import { UmbInstallerContext, UMB_INSTALLER_CONTEXT_TOKEN } from './installer.context'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; import './consent/installer-consent.element'; import './database/installer-database.element'; diff --git a/src/Umbraco.Web.UI.Client/src/installer/user/installer-user.element.ts b/src/Umbraco.Web.UI.Client/src/installer/user/installer-user.element.ts index 29ce34eac1..50a6c3da9c 100644 --- a/src/Umbraco.Web.UI.Client/src/installer/user/installer-user.element.ts +++ b/src/Umbraco.Web.UI.Client/src/installer/user/installer-user.element.ts @@ -1,7 +1,7 @@ import { css, CSSResultGroup, html } from 'lit'; import { customElement, state } from 'lit/decorators.js'; import { UmbInstallerContext, UMB_INSTALLER_CONTEXT_TOKEN } from '../installer.context'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; @customElement('umb-installer-user') export class UmbInstallerUserElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/upgrader/upgrader.element.ts b/src/Umbraco.Web.UI.Client/src/upgrader/upgrader.element.ts index a6cf345c62..4374ffccc6 100644 --- a/src/Umbraco.Web.UI.Client/src/upgrader/upgrader.element.ts +++ b/src/Umbraco.Web.UI.Client/src/upgrader/upgrader.element.ts @@ -5,7 +5,7 @@ import { html } from 'lit'; import { customElement, state } from 'lit/decorators.js'; import { UpgradeResource, UpgradeSettings } from '@umbraco-cms/backend-api'; import { tryExecute } from '@umbraco-cms/resources'; -import { UmbLitElement } from '@umbraco-cms/context-api'; +import { UmbLitElement } from '@umbraco-cms/element'; /** * @element umb-upgrader diff --git a/src/Umbraco.Web.UI.Client/tsconfig.json b/src/Umbraco.Web.UI.Client/tsconfig.json index 0bcb146108..e82a3ad7e7 100644 --- a/src/Umbraco.Web.UI.Client/tsconfig.json +++ b/src/Umbraco.Web.UI.Client/tsconfig.json @@ -24,6 +24,7 @@ "@umbraco-cms/backend-api": ["libs/backend-api"], "@umbraco-cms/context-api": ["libs/context-api"], "@umbraco-cms/controller": ["libs/controller"], + "@umbraco-cms/element": ["libs/element"], "@umbraco-cms/extensions-api": ["libs/extensions-api"], "@umbraco-cms/extensions-registry": ["libs/extensions-registry"], "@umbraco-cms/notification": ["libs/notification"], diff --git a/src/Umbraco.Web.UI.Client/utils/build-libs.js b/src/Umbraco.Web.UI.Client/utils/build-libs.js deleted file mode 100644 index f208d548b7..0000000000 --- a/src/Umbraco.Web.UI.Client/utils/build-libs.js +++ /dev/null @@ -1,21 +0,0 @@ -import fs from 'fs'; -import path, { dirname } from 'path'; -import { fileURLToPath } from 'url'; -import { execSync } from 'child_process'; - -const currDir = dirname(fileURLToPath(import.meta.url)); -const libsDir = path.resolve(currDir, '../libs'); - -fs.readdirSync(libsDir).forEach((lib) => { - - // Run `npm run build` for each lib - const libDir = path.resolve(libsDir, lib); - const packageJsonPath = path.resolve(libDir, 'package.json'); - - if (!fs.existsSync(packageJsonPath)) return; - const packageJson = JSON.parse(fs.readFileSync(packageJsonPath)); - if (packageJson.scripts && packageJson.scripts.build) { - console.log(`Building ${lib}...`); - execSync(`cd ${libDir} && npm run build`); - } -}); diff --git a/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs b/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs index 52b02686df..a1c7445c71 100644 --- a/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs +++ b/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs @@ -16,6 +16,7 @@ export default { '@umbraco-cms/backend-api': './libs/backend-api/index.ts', '@umbraco-cms/context-api': './src/core/context-api/index.ts', '@umbraco-cms/controller': './libs/controller/index.ts', + '@umbraco-cms/element': './libs/element/index.ts', '@umbraco-cms/extensions-api': './libs/extensions-api/index.ts', '@umbraco-cms/extensions-registry': './libs/extensions-registry/index.ts', '@umbraco-cms/notification': './libs/notification/index.ts',