diff --git a/src/Umbraco.Web.UI.Client/.storybook/main.js b/src/Umbraco.Web.UI.Client/.storybook/main.js index 73a7c5ea34..23de765208 100644 --- a/src/Umbraco.Web.UI.Client/.storybook/main.js +++ b/src/Umbraco.Web.UI.Client/.storybook/main.js @@ -1,3 +1,6 @@ +const tsconfigPaths = require('vite-tsconfig-paths').default; +const { mergeConfig } = require('vite'); + module.exports = { stories: ['../src/**/*.stories.mdx', '../src/**/*.stories.@(js|jsx|ts|tsx)'], addons: ['@storybook/addon-links', '@storybook/addon-essentials', '@storybook/addon-a11y'], @@ -10,4 +13,10 @@ module.exports = { builder: '@storybook/builder-vite', }, staticDirs: ['../public-assets'], + async viteFinal(config, { configType }) { + return mergeConfig(config, { + // customize the Vite config here + plugins: [tsconfigPaths()], + }); + }, }; diff --git a/src/Umbraco.Web.UI.Client/.storybook/preview.js b/src/Umbraco.Web.UI.Client/.storybook/preview.js index 72bc8ca488..5c2f95c9f5 100644 --- a/src/Umbraco.Web.UI.Client/.storybook/preview.js +++ b/src/Umbraco.Web.UI.Client/.storybook/preview.js @@ -1,5 +1,5 @@ -import '../src/core/context/context-provider.element'; -import '../src/css/custom-properties.css'; +import '../src/core/context-api/provide/context-provider.element'; +import '../src/core/css/custom-properties.css'; import '../src/backoffice/components/backoffice-modal-container.element'; import '@umbraco-ui/uui'; import '@umbraco-ui/uui-modal'; @@ -12,15 +12,15 @@ import { initialize, mswDecorator } from 'msw-storybook-addon'; import { setCustomElements } from '@storybook/web-components'; import customElementManifests from '../custom-elements.json'; -import { UmbExtensionRegistry } from '../src/core/extension'; +import { UmbExtensionRegistry } from '../src/core/extensions-api'; import { UmbDataTypeStore } from '../src/core/stores/data-type/data-type.store'; import { UmbDocumentTypeStore } from '../src/core/stores/document-type.store'; import { UmbNodeStore } from '../src/core/stores/node.store'; import { UmbPropertyEditorStore } from '../src/core/stores/property-editor/property-editor.store'; import { UmbPropertyEditorConfigStore } from '../src/core/stores/property-editor-config/property-editor-config.store'; import { UmbIconStore } from '../src/core/stores/icon/icon.store'; -import { onUnhandledRequest } from '../src/mocks/browser'; -import { handlers } from '../src/mocks/browser-handlers'; +import { onUnhandledRequest } from '../src/core/mocks/browser'; +import { handlers } from '../src/core/mocks/browser-handlers'; import { internalManifests } from '../src/temp-internal-manifests'; import { LitElement } from 'lit'; import { UmbModalService } from '../src/core/services/modal'; diff --git a/src/Umbraco.Web.UI.Client/devops/plop/templates/property-editor-ui/test.ts.hbs b/src/Umbraco.Web.UI.Client/devops/plop/templates/property-editor-ui/test.ts.hbs index 0a05a1b990..b93fab8b09 100644 --- a/src/Umbraco.Web.UI.Client/devops/plop/templates/property-editor-ui/test.ts.hbs +++ b/src/Umbraco.Web.UI.Client/devops/plop/templates/property-editor-ui/test.ts.hbs @@ -1,5 +1,5 @@ import { expect, fixture, html } from '@open-wc/testing'; -import { defaultA11yConfig } from '../../../core/helpers/chai'; +import { defaultA11yConfig } from '@umbraco-cms/test-utils'; import { {{ className extensionType name }} } from './{{ extensionFilename extensionType name }}.element'; describe('{{className extensionType name}}', () => { diff --git a/src/Umbraco.Web.UI.Client/e2e/installer.spec.ts b/src/Umbraco.Web.UI.Client/e2e/installer.spec.ts index b504058db8..d5f2457f04 100644 --- a/src/Umbraco.Web.UI.Client/e2e/installer.spec.ts +++ b/src/Umbraco.Web.UI.Client/e2e/installer.spec.ts @@ -1,9 +1,8 @@ import { rest } from 'msw'; -import umbracoPath from '../src/core/helpers/umbraco-path'; import { expect, test } from '../test'; - -import type { ProblemDetails, StatusResponse } from '../src/core/models'; +import { umbracoPath } from '@umbraco-cms/utils'; +import type { ProblemDetails, StatusResponse } from '@umbraco-cms/models'; test.describe('installer tests', () => { test.beforeEach(async ({ page, worker }) => { diff --git a/src/Umbraco.Web.UI.Client/e2e/upgrader.spec.ts b/src/Umbraco.Web.UI.Client/e2e/upgrader.spec.ts index 43ee82f78e..df76bfebfa 100644 --- a/src/Umbraco.Web.UI.Client/e2e/upgrader.spec.ts +++ b/src/Umbraco.Web.UI.Client/e2e/upgrader.spec.ts @@ -1,8 +1,7 @@ import { rest } from 'msw'; - -import umbracoPath from '../src/core/helpers/umbraco-path'; -import type { ProblemDetails, StatusResponse } from '../src/core/models'; import { expect, test } from '../test'; +import { umbracoPath } from '@umbraco-cms/utils'; +import type { ProblemDetails, StatusResponse } from '@umbraco-cms/models'; test.describe('upgrader tests', () => { test.beforeEach(async ({ page, worker }) => { diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json index 7324f3ed82..b2b54e8dfa 100644 --- a/src/Umbraco.Web.UI.Client/package-lock.json +++ b/src/Umbraco.Web.UI.Client/package-lock.json @@ -42,6 +42,7 @@ "@typescript-eslint/eslint-plugin": "^5.40.1", "@typescript-eslint/parser": "^5.40.1", "@web/dev-server-esbuild": "^0.3.1", + "@web/dev-server-import-maps": "^0.0.7", "@web/test-runner": "^0.14.0", "@web/test-runner-playwright": "^0.8.10", "babel-loader": "^8.2.5", @@ -63,6 +64,7 @@ "typescript": "^4.8.4", "vite": "^3.1.8", "vite-plugin-static-copy": "^0.9.0", + "vite-tsconfig-paths": "^3.5.1", "web-component-analyzer": "^2.0.0-next.4" }, "engines": { @@ -1989,6 +1991,12 @@ "node": ">=0.1.90" } }, + "node_modules/@cush/relative": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@cush/relative/-/relative-1.0.0.tgz", + "integrity": "sha512-RpfLEtTlyIxeNPGKcokS+p3BZII/Q3bYxryFRglh5H3A3T8q9fsLYm72VYAMEOOIBLEa8o93kFLiBDUWKrwXZA==", + "dev": true + }, "node_modules/@discoveryjs/json-ext": { "version": "0.5.7", "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz", @@ -2134,6 +2142,12 @@ "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", "dev": true }, + "node_modules/@import-maps/resolve": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@import-maps/resolve/-/resolve-1.0.1.tgz", + "integrity": "sha512-tWZNBIS1CoekcwlMuyG2mr0a1Wo5lb5lEHwwWvZo+5GLgr3e9LLDTtmgtCWEwBpXMkxn9D+2W9j2FY6eZQq0tA==", + "dev": true + }, "node_modules/@istanbuljs/load-nyc-config": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", @@ -7366,6 +7380,23 @@ "node": ">=10.0.0" } }, + "node_modules/@web/dev-server-import-maps": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/@web/dev-server-import-maps/-/dev-server-import-maps-0.0.7.tgz", + "integrity": "sha512-uq8SFRkh3Zic71boDP/GeNwc7BtOWFWLDam3JJF3G0L9gMZVm7WteeDxxn9ppdbGxRhvlJtxqBlSOvf3pl75qw==", + "dev": true, + "dependencies": { + "@import-maps/resolve": "^1.0.1", + "@types/parse5": "^6.0.1", + "@web/dev-server-core": "^0.3.19", + "@web/parse5-utils": "^1.3.0", + "parse5": "^6.0.1", + "picomatch": "^2.2.2" + }, + "engines": { + "node": ">=10.0.0" + } + }, "node_modules/@web/dev-server-rollup": { "version": "0.3.19", "resolved": "https://registry.npmjs.org/@web/dev-server-rollup/-/dev-server-rollup-0.3.19.tgz", @@ -14282,6 +14313,12 @@ "glob": "^7.1.6" } }, + "node_modules/glob-regex": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/glob-regex/-/glob-regex-0.3.2.tgz", + "integrity": "sha512-m5blUd3/OqDTWwzBBtWBPrGlAzatRywHameHeekAZyZrskYouOGdNB8T/q6JucucvJXtOuyHIn0/Yia7iDasDw==", + "dev": true + }, "node_modules/glob-to-regexp": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz", @@ -21697,6 +21734,24 @@ "node": ">= 10.13.0" } }, + "node_modules/recrawl-sync": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/recrawl-sync/-/recrawl-sync-2.2.2.tgz", + "integrity": "sha512-E2sI4F25Fu2nrfV+KsnC7/qfk/spQIYXlonfQoS4rwxeNK5BjxnLPbWiRXHVXPwYBOTWtPX5765kTm/zJiL+LQ==", + "dev": true, + "dependencies": { + "@cush/relative": "^1.0.0", + "glob-regex": "^0.3.0", + "slash": "^3.0.0", + "tslib": "^1.9.3" + } + }, + "node_modules/recrawl-sync/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + }, "node_modules/redent": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz", @@ -26050,6 +26105,35 @@ "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", "dev": true }, + "node_modules/vite-tsconfig-paths": { + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/vite-tsconfig-paths/-/vite-tsconfig-paths-3.5.1.tgz", + "integrity": "sha512-t7cPvDMDxOCUxxNLqngXiX+L6jPYBr+eMgkeVadknxBb89d2s1aejz+wFEep010VfXjGVAUWGEFPe1fkRYTFvg==", + "dev": true, + "dependencies": { + "debug": "^4.1.1", + "globrex": "^0.1.2", + "recrawl-sync": "^2.0.3", + "tsconfig-paths": "^4.0.0" + }, + "peerDependencies": { + "vite": ">2.0.0-0" + } + }, + "node_modules/vite-tsconfig-paths/node_modules/tsconfig-paths": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.1.0.tgz", + "integrity": "sha512-AHx4Euop/dXFC+Vx589alFba8QItjF+8hf8LtmuiCwHyI4rHXQtOOENaM8kvYf5fR0dRChy3wzWIZ9WbB7FWow==", + "dev": true, + "dependencies": { + "json5": "^2.2.1", + "minimist": "^1.2.6", + "strip-bom": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, "node_modules/vite/node_modules/@esbuild/linux-loong64": { "version": "0.15.10", "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.15.10.tgz", @@ -29287,6 +29371,12 @@ "dev": true, "optional": true }, + "@cush/relative": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@cush/relative/-/relative-1.0.0.tgz", + "integrity": "sha512-RpfLEtTlyIxeNPGKcokS+p3BZII/Q3bYxryFRglh5H3A3T8q9fsLYm72VYAMEOOIBLEa8o93kFLiBDUWKrwXZA==", + "dev": true + }, "@discoveryjs/json-ext": { "version": "0.5.7", "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz", @@ -29388,6 +29478,12 @@ "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", "dev": true }, + "@import-maps/resolve": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@import-maps/resolve/-/resolve-1.0.1.tgz", + "integrity": "sha512-tWZNBIS1CoekcwlMuyG2mr0a1Wo5lb5lEHwwWvZo+5GLgr3e9LLDTtmgtCWEwBpXMkxn9D+2W9j2FY6eZQq0tA==", + "dev": true + }, "@istanbuljs/load-nyc-config": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", @@ -33489,6 +33585,20 @@ "ua-parser-js": "^1.0.2" } }, + "@web/dev-server-import-maps": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/@web/dev-server-import-maps/-/dev-server-import-maps-0.0.7.tgz", + "integrity": "sha512-uq8SFRkh3Zic71boDP/GeNwc7BtOWFWLDam3JJF3G0L9gMZVm7WteeDxxn9ppdbGxRhvlJtxqBlSOvf3pl75qw==", + "dev": true, + "requires": { + "@import-maps/resolve": "^1.0.1", + "@types/parse5": "^6.0.1", + "@web/dev-server-core": "^0.3.19", + "@web/parse5-utils": "^1.3.0", + "parse5": "^6.0.1", + "picomatch": "^2.2.2" + } + }, "@web/dev-server-rollup": { "version": "0.3.19", "resolved": "https://registry.npmjs.org/@web/dev-server-rollup/-/dev-server-rollup-0.3.19.tgz", @@ -38833,6 +38943,12 @@ "@types/glob": "^7.1.3" } }, + "glob-regex": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/glob-regex/-/glob-regex-0.3.2.tgz", + "integrity": "sha512-m5blUd3/OqDTWwzBBtWBPrGlAzatRywHameHeekAZyZrskYouOGdNB8T/q6JucucvJXtOuyHIn0/Yia7iDasDw==", + "dev": true + }, "glob-to-regexp": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz", @@ -44388,6 +44504,26 @@ "resolve": "^1.20.0" } }, + "recrawl-sync": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/recrawl-sync/-/recrawl-sync-2.2.2.tgz", + "integrity": "sha512-E2sI4F25Fu2nrfV+KsnC7/qfk/spQIYXlonfQoS4rwxeNK5BjxnLPbWiRXHVXPwYBOTWtPX5765kTm/zJiL+LQ==", + "dev": true, + "requires": { + "@cush/relative": "^1.0.0", + "glob-regex": "^0.3.0", + "slash": "^3.0.0", + "tslib": "^1.9.3" + }, + "dependencies": { + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + } + } + }, "redent": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz", @@ -47991,6 +48127,31 @@ } } }, + "vite-tsconfig-paths": { + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/vite-tsconfig-paths/-/vite-tsconfig-paths-3.5.1.tgz", + "integrity": "sha512-t7cPvDMDxOCUxxNLqngXiX+L6jPYBr+eMgkeVadknxBb89d2s1aejz+wFEep010VfXjGVAUWGEFPe1fkRYTFvg==", + "dev": true, + "requires": { + "debug": "^4.1.1", + "globrex": "^0.1.2", + "recrawl-sync": "^2.0.3", + "tsconfig-paths": "^4.0.0" + }, + "dependencies": { + "tsconfig-paths": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.1.0.tgz", + "integrity": "sha512-AHx4Euop/dXFC+Vx589alFba8QItjF+8hf8LtmuiCwHyI4rHXQtOOENaM8kvYf5fR0dRChy3wzWIZ9WbB7FWow==", + "dev": true, + "requires": { + "json5": "^2.2.1", + "minimist": "^1.2.6", + "strip-bom": "^3.0.0" + } + } + } + }, "vm-browserify": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz", diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json index 94145df665..09930ffae4 100644 --- a/src/Umbraco.Web.UI.Client/package.json +++ b/src/Umbraco.Web.UI.Client/package.json @@ -73,6 +73,7 @@ "@typescript-eslint/eslint-plugin": "^5.40.1", "@typescript-eslint/parser": "^5.40.1", "@web/dev-server-esbuild": "^0.3.1", + "@web/dev-server-import-maps": "^0.0.7", "@web/test-runner": "^0.14.0", "@web/test-runner-playwright": "^0.8.10", "babel-loader": "^8.2.5", @@ -94,6 +95,7 @@ "typescript": "^4.8.4", "vite": "^3.1.8", "vite-plugin-static-copy": "^0.9.0", + "vite-tsconfig-paths": "^3.5.1", "web-component-analyzer": "^2.0.0-next.4" }, "msw": { diff --git a/src/Umbraco.Web.UI.Client/src/mocks/App_Plugins/custom-entrypoint.js b/src/Umbraco.Web.UI.Client/public-assets/App_Plugins/custom-entrypoint.js similarity index 100% rename from src/Umbraco.Web.UI.Client/src/mocks/App_Plugins/custom-entrypoint.js rename to src/Umbraco.Web.UI.Client/public-assets/App_Plugins/custom-entrypoint.js diff --git a/src/Umbraco.Web.UI.Client/src/mocks/App_Plugins/package-view.js b/src/Umbraco.Web.UI.Client/public-assets/App_Plugins/package-view.js similarity index 100% rename from src/Umbraco.Web.UI.Client/src/mocks/App_Plugins/package-view.js rename to src/Umbraco.Web.UI.Client/public-assets/App_Plugins/package-view.js diff --git a/src/Umbraco.Web.UI.Client/src/mocks/App_Plugins/property-editor.js b/src/Umbraco.Web.UI.Client/public-assets/App_Plugins/property-editor.js similarity index 100% rename from src/Umbraco.Web.UI.Client/src/mocks/App_Plugins/property-editor.js rename to src/Umbraco.Web.UI.Client/public-assets/App_Plugins/property-editor.js diff --git a/src/Umbraco.Web.UI.Client/src/mocks/App_Plugins/section.js b/src/Umbraco.Web.UI.Client/public-assets/App_Plugins/section.js similarity index 100% rename from src/Umbraco.Web.UI.Client/src/mocks/App_Plugins/section.js rename to src/Umbraco.Web.UI.Client/public-assets/App_Plugins/section.js diff --git a/src/Umbraco.Web.UI.Client/src/app.ts b/src/Umbraco.Web.UI.Client/src/app.ts index a966d8fd08..765e71c826 100644 --- a/src/Umbraco.Web.UI.Client/src/app.ts +++ b/src/Umbraco.Web.UI.Client/src/app.ts @@ -1,4 +1,4 @@ -import './css/custom-properties.css'; +import './core/css/custom-properties.css'; import 'router-slot'; // TODO: remove these imports when they are part of UUI @@ -12,12 +12,12 @@ import { css, html, LitElement } from 'lit'; import { customElement, state } from 'lit/decorators.js'; import type { Guard, IRoute } from 'router-slot/model'; -import { getManifests, getServerStatus } from './core/api/fetcher'; -import { UmbContextProviderMixin } from './core/context'; -import { UmbExtensionRegistry } from './core/extension'; import { internalManifests } from './temp-internal-manifests'; +import { getManifests, getServerStatus } from '@umbraco-cms/backend-api'; +import { UmbExtensionRegistry } from '@umbraco-cms/extensions-api'; +import { UmbContextProviderMixin } from '@umbraco-cms/context-api'; -import type { ServerStatus } from './core/models'; +import type { ServerStatus } from '@umbraco-cms/models'; @customElement('umb-app') export class UmbApp extends UmbContextProviderMixin(LitElement) { diff --git a/src/Umbraco.Web.UI.Client/src/auth/login/login.element.ts b/src/Umbraco.Web.UI.Client/src/auth/login/login.element.ts index 018262ff40..3e96af7cf6 100644 --- a/src/Umbraco.Web.UI.Client/src/auth/login/login.element.ts +++ b/src/Umbraco.Web.UI.Client/src/auth/login/login.element.ts @@ -6,7 +6,7 @@ import { customElement, state } from 'lit/decorators.js'; import { ifDefined } from 'lit/directives/if-defined.js'; import { query } from 'router-slot'; -import { postUserLogin } from '../../core/api/fetcher'; +import { postUserLogin } from '@umbraco-cms/backend-api'; @customElement('umb-login') export default class UmbLogin extends LitElement { diff --git a/src/Umbraco.Web.UI.Client/src/auth/login/login.test.ts b/src/Umbraco.Web.UI.Client/src/auth/login/login.test.ts index 4e0e92841a..d937ffba1e 100644 --- a/src/Umbraco.Web.UI.Client/src/auth/login/login.test.ts +++ b/src/Umbraco.Web.UI.Client/src/auth/login/login.test.ts @@ -1,7 +1,6 @@ import { expect, fixture, html } from '@open-wc/testing'; - -import { defaultA11yConfig } from '../../core/helpers/chai'; import UmbLogin from './login.element'; +import { defaultA11yConfig } from '@umbraco-cms/test-utils'; describe('UmbLogin', () => { let element: UmbLogin; 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 d7cff0d891..7727033534 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/backoffice.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/backoffice.element.ts @@ -16,7 +16,6 @@ import { defineElement } from '@umbraco-ui/uui-base/lib/registration'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { css, html, LitElement } from 'lit'; -import { UmbContextConsumerMixin, UmbContextProviderMixin } from '../core/context'; import { UmbModalService } from '../core/services/modal'; import { UmbNotificationService } from '../core/services/notification'; import { UmbDataTypeStore } from '../core/stores/data-type/data-type.store'; @@ -29,6 +28,7 @@ import { UmbPropertyEditorStore } from '../core/stores/property-editor/property- import { UmbIconStore } from '../core/stores/icon/icon.store'; import { UmbPropertyEditorConfigStore } from '../core/stores/property-editor-config/property-editor-config.store'; import { UmbUserGroupStore } from '../core/stores/user/user-group.store'; +import { UmbContextConsumerMixin, UmbContextProviderMixin } from '@umbraco-cms/context-api'; @defineElement('umb-backoffice') export class UmbBackofficeElement extends UmbContextConsumerMixin(UmbContextProviderMixin(LitElement)) { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/components/backoffice-header-sections.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/components/backoffice-header-sections.element.ts index efb4bc7f3a..13e781174b 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/components/backoffice-header-sections.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/components/backoffice-header-sections.element.ts @@ -2,11 +2,10 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { css, CSSResultGroup, html, LitElement } from 'lit'; import { customElement, state } from 'lit/decorators.js'; import { when } from 'lit/directives/when.js'; - -import { UmbContextConsumerMixin, UmbContextProviderMixin } from '../../core/context'; -import type { ManifestSection } from '../../core/models'; -import { UmbObserverMixin } from '../../core/observer'; import { UmbSectionStore } from '../../core/stores/section.store'; +import { UmbObserverMixin } from '@umbraco-cms/observable-api'; +import { UmbContextConsumerMixin, UmbContextProviderMixin } from '@umbraco-cms/context-api'; +import type { ManifestSection } from '@umbraco-cms/models'; @customElement('umb-backoffice-header-sections') export class UmbBackofficeHeaderSections extends UmbContextProviderMixin( diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/components/backoffice-main.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/components/backoffice-main.element.ts index b938366d1c..cea506db07 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/components/backoffice-main.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/components/backoffice-main.element.ts @@ -3,13 +3,12 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { css, html, LitElement } from 'lit'; import { state } from 'lit/decorators.js'; import { IRoutingInfo } from 'router-slot'; - -import { UmbContextConsumerMixin, UmbContextProviderMixin } from '../../core/context'; -import { createExtensionElement } from '../../core/extension'; -import type { ManifestSection } from '../../core/models'; -import { UmbObserverMixin } from '../../core/observer'; import { UmbSectionStore } from '../../core/stores/section.store'; import { UmbSectionContext } from '../sections/section.context'; +import { UmbObserverMixin } from '@umbraco-cms/observable-api'; +import { createExtensionElement } from '@umbraco-cms/extensions-api'; +import { UmbContextConsumerMixin, UmbContextProviderMixin } from '@umbraco-cms/context-api'; +import type { ManifestSection } from '@umbraco-cms/models'; @defineElement('umb-backoffice-main') export class UmbBackofficeMain extends UmbContextProviderMixin(UmbContextConsumerMixin(UmbObserverMixin(LitElement))) { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/components/backoffice-modal-container.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/components/backoffice-modal-container.element.ts index 2bde88cd98..0df2a7707b 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/components/backoffice-modal-container.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/components/backoffice-modal-container.element.ts @@ -2,9 +2,9 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { css, CSSResultGroup, html, LitElement } from 'lit'; import { customElement, state } from 'lit/decorators.js'; import { repeat } from 'lit/directives/repeat.js'; -import { UmbContextConsumerMixin } from '../../core/context'; -import { UmbObserverMixin } from '../../core/observer'; import { UmbModalHandler, UmbModalService } from '../../core/services/modal'; +import { UmbObserverMixin } from '@umbraco-cms/observable-api'; +import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; @customElement('umb-backoffice-modal-container') export class UmbBackofficeModalContainer extends UmbContextConsumerMixin(UmbObserverMixin(LitElement)) { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/components/backoffice-notification-container.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/components/backoffice-notification-container.element.ts index df01a9143e..ee93f2a4c0 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/components/backoffice-notification-container.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/components/backoffice-notification-container.element.ts @@ -2,9 +2,9 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { css, CSSResultGroup, html, LitElement } from 'lit'; import { customElement, state } from 'lit/decorators.js'; import { repeat } from 'lit/directives/repeat.js'; -import { UmbContextConsumerMixin } from '../../core/context'; -import { UmbObserverMixin } from '../../core/observer'; import type { UmbNotificationService, UmbNotificationHandler } from '../../core/services/notification'; +import { UmbObserverMixin } from '@umbraco-cms/observable-api'; +import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; @customElement('umb-backoffice-notification-container') export class UmbBackofficeNotificationContainer extends UmbContextConsumerMixin(UmbObserverMixin(LitElement)) { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/components/entity-property/entity-property.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/components/entity-property/entity-property.element.ts index afdb28c61a..7682252e6c 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/components/entity-property/entity-property.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/components/entity-property/entity-property.element.ts @@ -1,11 +1,10 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { css, html, LitElement, PropertyValueMap } from 'lit'; import { customElement, property, state } from 'lit/decorators.js'; - -import { UmbContextConsumerMixin } from '../../../core/context'; -import { createExtensionElement, UmbExtensionRegistry } from '../../../core/extension'; -import type { ManifestPropertyEditorUI, ManifestTypes } from '../../../core/models'; -import { UmbObserverMixin } from '../../../core/observer'; +import { UmbObserverMixin } from '@umbraco-cms/observable-api'; +import { createExtensionElement, UmbExtensionRegistry } from '@umbraco-cms/extensions-api'; +import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; +import type { ManifestPropertyEditorUI, ManifestTypes } from '@umbraco-cms/models'; import '../../property-actions/shared/property-action-menu/property-action-menu.element'; import '../../editors/shared/editor-property-layout/editor-property-layout.element'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/components/node-property/node-property.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/components/node-property/node-property.element.ts index f711058574..861f53a3cf 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/components/node-property/node-property.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/components/node-property/node-property.element.ts @@ -4,14 +4,14 @@ import { ifDefined } from 'lit-html/directives/if-defined.js'; import { customElement, property, state } from 'lit/decorators.js'; import { EMPTY, of, switchMap } from 'rxjs'; -import { UmbContextConsumerMixin } from '../../../core/context'; import { UmbDataTypeStore } from '../../../core/stores/data-type/data-type.store'; -import { UmbExtensionRegistry } from '../../../core/extension'; -import { NodeProperty } from '../../../mocks/data/node.data'; +import { NodeProperty } from '../../../core/mocks/data/node.data'; +import { UmbObserverMixin } from '@umbraco-cms/observable-api'; +import type { ManifestTypes } from '@umbraco-cms/models'; +import { UmbExtensionRegistry } from '@umbraco-cms/extensions-api'; +import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; import '../entity-property/entity-property.element'; -import { UmbObserverMixin } from '../../../core/observer'; -import type { ManifestTypes } from '../../../core/models'; @customElement('umb-node-property') export class UmbNodePropertyElement extends UmbContextConsumerMixin(UmbObserverMixin(LitElement)) { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/published-status/dashboard-published-status.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/published-status/dashboard-published-status.element.ts index e3cd7fe483..0883f9bb5f 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/published-status/dashboard-published-status.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/published-status/dashboard-published-status.element.ts @@ -3,16 +3,16 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { css, html, LitElement } from 'lit'; import { customElement, state } from 'lit/decorators.js'; +import { UmbModalService } from '../../../core/services/modal'; +import { UmbNotificationService } from '../../../core/services/notification'; +import { UmbNotificationDefaultData } from '../../../core/services/notification/layouts/default'; import { getPublishedCacheStatus, postPublishedCacheReload, postPublishedCacheRebuild, getPublishedCacheCollect, -} from '../../../core/api/fetcher'; -import { UmbContextConsumerMixin } from '../../../core/context'; -import { UmbModalService } from '../../../core/services/modal'; -import { UmbNotificationService } from '../../../core/services/notification'; -import { UmbNotificationDefaultData } from '../../../core/services/notification/layouts/default'; +} from '@umbraco-cms/backend-api'; +import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; @customElement('umb-dashboard-published-status') export class UmbDashboardPublishedStatusElement extends UmbContextConsumerMixin(LitElement) { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/published-status/dashboard-published-status.test.ts b/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/published-status/dashboard-published-status.test.ts index 64cd1bc0ab..ed4c366109 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/published-status/dashboard-published-status.test.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/published-status/dashboard-published-status.test.ts @@ -1,7 +1,7 @@ import { expect, fixture, html } from '@open-wc/testing'; -import { defaultA11yConfig } from '../../../core/helpers/chai'; import { UmbDashboardPublishedStatusElement } from './dashboard-published-status.element'; +import { defaultA11yConfig } from '@umbraco-cms/test-utils'; describe('UmbDashboardPublishedStatus', () => { let element: UmbDashboardPublishedStatusElement; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/settings-welcome/dashboard-settings-welcome.test.ts b/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/settings-welcome/dashboard-settings-welcome.test.ts index d2db4039cc..1ca8ac3378 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/settings-welcome/dashboard-settings-welcome.test.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/settings-welcome/dashboard-settings-welcome.test.ts @@ -1,7 +1,7 @@ import { expect, fixture, html } from '@open-wc/testing'; -import { defaultA11yConfig } from '../../../core/helpers/chai'; import { UmbDashboardSettingsWelcomeElement } from './dashboard-settings-welcome.element'; +import { defaultA11yConfig } from '@umbraco-cms/test-utils'; describe('UmbDashboardSettingsWelcomeElement', () => { let element: UmbDashboardSettingsWelcomeElement; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/telemetry/dashboard-telemetry.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/telemetry/dashboard-telemetry.element.ts index dc9fc75d7d..d54e7380e1 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/telemetry/dashboard-telemetry.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/telemetry/dashboard-telemetry.element.ts @@ -1,11 +1,9 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { css, html, LitElement } from 'lit'; import { unsafeHTML } from 'lit/directives/unsafe-html.js'; - import { customElement, state } from 'lit/decorators.js'; - -import type { TelemetryModel } from '../../../core/models'; -import { getConsentLevel, getConsentLevels, postConsentLevel } from '../../../core/api/fetcher'; +import { getConsentLevel, getConsentLevels, postConsentLevel } from '@umbraco-cms/backend-api'; +import type { TelemetryModel } from '@umbraco-cms/models'; export type SettingOption = 'Minimal' | 'Basic' | 'Detailed'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/telemetry/dashboard-telemetry.test.ts b/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/telemetry/dashboard-telemetry.test.ts index 01b34283e4..72662348af 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/telemetry/dashboard-telemetry.test.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/telemetry/dashboard-telemetry.test.ts @@ -1,6 +1,6 @@ import { expect, fixture, html } from '@open-wc/testing'; -import { defaultA11yConfig } from '../../../core/helpers/chai'; import { UmbDashboardTelemetryElement } from './dashboard-telemetry.element'; +import { defaultA11yConfig } from '@umbraco-cms/test-utils'; describe('UmbDashboardTelemetryElement', () => { let element: UmbDashboardTelemetryElement; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/data-type.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/data-type.context.ts index 567129491a..8717fdb542 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/data-type.context.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/data-type.context.ts @@ -1,5 +1,5 @@ import { BehaviorSubject, Observable } from 'rxjs'; -import { DataTypeDetails } from '../../../mocks/data/data-type.data'; +import { DataTypeDetails } from '../../../core/mocks/data/data-type.data'; export class UmbDataTypeContext { // TODO: figure out how fine grained we want to make our observables. diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/editor-data-type.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/editor-data-type.element.ts index b15d012022..0e3631fbe0 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/editor-data-type.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/editor-data-type.element.ts @@ -2,13 +2,13 @@ import { UUIButtonState, UUIInputElement, UUIInputEvent } from '@umbraco-ui/uui' import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { css, html, LitElement } from 'lit'; import { customElement, property, state } from 'lit/decorators.js'; -import { UmbContextProviderMixin, UmbContextConsumerMixin } from '../../../core/context'; import { UmbNotificationService } from '../../../core/services/notification'; import { UmbDataTypeStore } from '../../../core/stores/data-type/data-type.store'; import { UmbNotificationDefaultData } from '../../../core/services/notification/layouts/default'; -import { UmbObserverMixin } from '../../../core/observer'; -import type { DataTypeDetails } from '../../../mocks/data/data-type.data'; +import type { DataTypeDetails } from '../../../core/mocks/data/data-type.data'; import { UmbDataTypeContext } from './data-type.context'; +import { UmbObserverMixin } from '@umbraco-cms/observable-api'; +import { UmbContextProviderMixin, UmbContextConsumerMixin } from '@umbraco-cms/context-api'; import '../shared/editor-entity-layout/editor-entity-layout.element'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/editor-data-type.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/editor-data-type.stories.ts index 94b73ec579..feb01c4aef 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/editor-data-type.stories.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/editor-data-type.stories.ts @@ -3,7 +3,7 @@ import './editor-data-type.element'; import { Meta, Story } from '@storybook/web-components'; import { html } from 'lit-html'; -import { data } from '../../../mocks/data/data-type.data'; +import { data } from '../../../core/mocks/data/data-type.data'; import type { UmbEditorDataTypeElement } from './editor-data-type.element'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/views/edit/editor-view-data-type-edit.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/views/edit/editor-view-data-type-edit.element.ts index 8820d8c434..88a1cfd2d0 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/views/edit/editor-view-data-type-edit.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/views/edit/editor-view-data-type-edit.element.ts @@ -2,14 +2,13 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { css, html, LitElement, nothing } from 'lit'; import { customElement, state } from 'lit/decorators.js'; import { UmbModalService } from '../../../../../core/services/modal'; - -import { UmbContextConsumerMixin } from '../../../../../core/context'; import { UmbDataTypeContext } from '../../data-type.context'; -import type { DataTypeDetails } from '../../../../../mocks/data/data-type.data'; -import type { UmbExtensionRegistry } from '../../../../../core/extension'; +import type { DataTypeDetails } from '../../../../../core/mocks/data/data-type.data'; import type { UmbPropertyEditorStore } from '../../../../../core/stores/property-editor/property-editor.store'; -import type { ManifestPropertyEditorUI } from '../../../../../core/models'; -import { UmbObserverMixin } from '../../../../../core/observer'; +import { UmbObserverMixin } from '@umbraco-cms/observable-api'; +import type { UmbExtensionRegistry } from '@umbraco-cms/extensions-api'; +import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; +import type { ManifestPropertyEditorUI } from '@umbraco-cms/models'; import '../../../../property-editor-uis/shared/property-editor-config/property-editor-config.element'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/views/edit/editor-view-data-type-edit.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/views/edit/editor-view-data-type-edit.stories.ts index e977cc073c..4eeda10e79 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/views/edit/editor-view-data-type-edit.stories.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/views/edit/editor-view-data-type-edit.stories.ts @@ -3,7 +3,7 @@ import './editor-view-data-type-edit.element'; import { Meta, Story } from '@storybook/web-components'; import { html } from 'lit-html'; -import { data } from '../../../../../mocks/data/data-type.data'; +import { data } from '../../../../../core/mocks/data/data-type.data'; import { UmbDataTypeContext } from '../../data-type.context'; import type { UmbEditorViewDataTypeEditElement } from './editor-view-data-type-edit.element'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/views/info/editor-view-data-type-info.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/views/info/editor-view-data-type-info.element.ts index 9c9ee3d495..4379efc228 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/views/info/editor-view-data-type-info.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/views/info/editor-view-data-type-info.element.ts @@ -2,12 +2,10 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { css, html, LitElement } from 'lit'; import { customElement, state } from 'lit/decorators.js'; import { distinctUntilChanged } from 'rxjs'; - -import { UmbContextConsumerMixin } from '../../../../../core/context'; import { UmbDataTypeContext } from '../../data-type.context'; - -import type { DataTypeDetails } from '../../../../../mocks/data/data-type.data'; -import { UmbObserverMixin } from '../../../../../core/observer'; +import type { DataTypeDetails } from '../../../../../core/mocks/data/data-type.data'; +import { UmbObserverMixin } from '@umbraco-cms/observable-api'; +import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; @customElement('umb-editor-view-data-type-info') export class UmbEditorViewDataTypeInfoElement extends UmbContextConsumerMixin(UmbObserverMixin(LitElement)) { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/views/info/editor-view-data-type-info.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/views/info/editor-view-data-type-info.stories.ts index 345d1a5a50..d84495e6d4 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/views/info/editor-view-data-type-info.stories.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/views/info/editor-view-data-type-info.stories.ts @@ -3,7 +3,7 @@ import './editor-view-data-type-info.element'; import { Meta, Story } from '@storybook/web-components'; import { html } from 'lit-html'; -import { data } from '../../../../../mocks/data/data-type.data'; +import { data } from '../../../../../core/mocks/data/data-type.data'; import { UmbDataTypeContext } from '../../data-type.context'; import type { UmbEditorViewDataTypeInfoElement } from './editor-view-data-type-info.element'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/document-type/document-type.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/document-type/document-type.context.ts index a95a49f1b8..707e9afe52 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/document-type/document-type.context.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/editors/document-type/document-type.context.ts @@ -1,5 +1,5 @@ import { BehaviorSubject, Observable } from 'rxjs'; -import { DocumentTypeEntity } from '../../../mocks/data/document-type.data'; +import { DocumentTypeEntity } from '../../../core/mocks/data/document-type.data'; export class UmbDocumentTypeContext { // TODO: figure out how fine grained we want to make our observables. diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/document-type/editor-document-type.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/document-type/editor-document-type.element.ts index 9585453426..1f09770359 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/document-type/editor-document-type.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/editors/document-type/editor-document-type.element.ts @@ -3,13 +3,13 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { css, html, LitElement } from 'lit'; import { customElement, property, state } from 'lit/decorators.js'; import { distinctUntilChanged } from 'rxjs'; -import { UmbContextConsumerMixin, UmbContextProviderMixin } from '../../../core/context'; import { UmbNotificationService } from '../../../core/services/notification'; import { UmbDocumentTypeStore } from '../../../core/stores/document-type.store'; -import { DocumentTypeEntity } from '../../../mocks/data/document-type.data'; +import { DocumentTypeEntity } from '../../../core/mocks/data/document-type.data'; import { UmbNotificationDefaultData } from '../../../core/services/notification/layouts/default'; -import { UmbObserverMixin } from '../../../core/observer'; import { UmbDocumentTypeContext } from './document-type.context'; +import { UmbObserverMixin } from '@umbraco-cms/observable-api'; +import { UmbContextConsumerMixin, UmbContextProviderMixin } from '@umbraco-cms/context-api'; import '../shared/editor-entity-layout/editor-entity-layout.element'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/document-type/editor-document-type.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/document-type/editor-document-type.stories.ts index efb3070157..501f1e077f 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/document-type/editor-document-type.stories.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/editors/document-type/editor-document-type.stories.ts @@ -3,7 +3,7 @@ import './editor-document-type.element'; import { Meta, Story } from '@storybook/web-components'; import { html } from 'lit-html'; -import { data } from '../../../mocks/data/document-type.data'; +import { data } from '../../../core/mocks/data/document-type.data'; import type { UmbEditorDocumentTypeElement } from './editor-document-type.element'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/document-type/views/editor-view-document-type-design.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/document-type/views/editor-view-document-type-design.element.ts index ec6f7bedcb..38aa5c548d 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/document-type/views/editor-view-document-type-design.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/editors/document-type/views/editor-view-document-type-design.element.ts @@ -1,11 +1,11 @@ import { css, html, LitElement } from 'lit'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; -import { customElement, property, state } from 'lit/decorators.js'; +import { customElement, state } from 'lit/decorators.js'; import { distinctUntilChanged } from 'rxjs'; -import { UmbContextConsumerMixin } from '../../../../core/context'; -import type { DocumentTypeEntity } from '../../../../mocks/data/document-type.data'; +import type { DocumentTypeEntity } from '../../../../core/mocks/data/document-type.data'; import { UmbDocumentTypeContext } from '../document-type.context'; -import { UmbObserverMixin } from '../../../../core/observer'; +import { UmbObserverMixin } from '@umbraco-cms/observable-api'; +import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; @customElement('umb-editor-view-document-type-design') export class UmbEditorViewDocumentTypeDesignElement extends UmbContextConsumerMixin(UmbObserverMixin(LitElement)) { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/document-type/views/editor-view-document-type-design.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/document-type/views/editor-view-document-type-design.stories.ts index 1ff23e754d..50546b65b3 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/document-type/views/editor-view-document-type-design.stories.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/editors/document-type/views/editor-view-document-type-design.stories.ts @@ -3,7 +3,7 @@ import './editor-view-document-type-design.element'; import { Meta, Story } from '@storybook/web-components'; import { html } from 'lit-html'; -import { data } from '../../../../mocks/data/document-type.data'; +import { data } from '../../../../core/mocks/data/document-type.data'; import { UmbDocumentTypeContext } from '../document-type.context'; import type { UmbEditorViewDocumentTypeDesignElement } from './editor-view-document-type-design.element'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/document/editor-document.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/document/editor-document.stories.ts index f7251e5684..5510e6b6b4 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/document/editor-document.stories.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/editors/document/editor-document.stories.ts @@ -3,7 +3,7 @@ import './editor-document.element'; import { Meta, Story } from '@storybook/web-components'; import { html } from 'lit-html'; -import { data } from '../../../mocks/data/node.data'; +import { data } from '../../../core/mocks/data/node.data'; import type { UmbEditorDocumentElement } from './editor-document.element'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/extensions/editor-extensions.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/extensions/editor-extensions.element.ts index 0719be7da3..f96be0a497 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/extensions/editor-extensions.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/editors/extensions/editor-extensions.element.ts @@ -1,12 +1,9 @@ import { html, LitElement } from 'lit'; import { customElement, state } from 'lit/decorators.js'; - -import { UmbContextConsumerMixin } from '../../../core/context'; -import { UmbExtensionRegistry } from '../../../core/extension'; -import { isManifestElementType } from '../../../core/extension/is-extension.function'; - -import type { ManifestTypes } from '../../../core/models'; -import { UmbObserverMixin } from '../../../core/observer'; +import { UmbObserverMixin } from '@umbraco-cms/observable-api'; +import { UmbExtensionRegistry, isManifestElementType } from '@umbraco-cms/extensions-api'; +import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; +import type { ManifestTypes } from '@umbraco-cms/models'; import '../shared/editor-entity-layout/editor-entity-layout.element'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/media/editor-media.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/media/editor-media.stories.ts index 03f1fa99a1..2dd166743b 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/media/editor-media.stories.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/editors/media/editor-media.stories.ts @@ -3,7 +3,7 @@ import './editor-media.element'; import { Meta, Story } from '@storybook/web-components'; import { html } from 'lit-html'; -import { data } from '../../../mocks/data/node.data'; +import { data } from '../../../core/mocks/data/node.data'; import type { UmbEditorMediaElement } from './editor-media.element'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/editor-action-extension/editor-action-extension.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/editor-action-extension/editor-action-extension.element.ts index de0542a5b4..94711a1606 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/editor-action-extension/editor-action-extension.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/editor-action-extension/editor-action-extension.element.ts @@ -1,8 +1,8 @@ import { UUITextStyles } from '@umbraco-ui/uui'; import { CSSResultGroup, html, LitElement } from 'lit'; import { customElement, property, state } from 'lit/decorators.js'; -import { createExtensionElement } from '../../../../core/extension'; -import type { ManifestEditorAction } from '../../../../core/models'; +import { createExtensionElement } from '@umbraco-cms/extensions-api'; +import type { ManifestEditorAction } from '@umbraco-cms/models'; @customElement('umb-editor-action-extension') export class UmbEditorActionExtensionElement extends LitElement { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/editor-entity-layout/editor-entity-layout.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/editor-entity-layout/editor-entity-layout.element.ts index 5c6ec1bfee..e374da08b7 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/editor-entity-layout/editor-entity-layout.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/editor-entity-layout/editor-entity-layout.element.ts @@ -4,10 +4,10 @@ import { customElement, property, state } from 'lit/decorators.js'; import { IRoute, IRoutingInfo, PageComponent, RouterSlot } from 'router-slot'; import { map } from 'rxjs'; -import { UmbContextConsumerMixin } from '../../../../core/context'; -import { createExtensionElement, UmbExtensionRegistry } from '../../../../core/extension'; -import { UmbObserverMixin } from '../../../../core/observer'; -import type { ManifestEditorAction, ManifestEditorView } from '../../../../core/models'; +import { UmbObserverMixin } from '@umbraco-cms/observable-api'; +import { createExtensionElement, UmbExtensionRegistry } from '@umbraco-cms/extensions-api'; +import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; +import type { ManifestEditorAction, ManifestEditorView } from '@umbraco-cms/models'; import '../editor-layout/editor-layout.element'; import '../editor-action-extension/editor-action-extension.element'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/editor-entity/editor-entity.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/editor-entity/editor-entity.element.ts index 49153cce17..e52ce4bcbe 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/editor-entity/editor-entity.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/editor-entity/editor-entity.element.ts @@ -2,11 +2,11 @@ import { css, html, LitElement } from 'lit'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, property, state } from 'lit/decorators.js'; import { map } from 'rxjs'; -import type { ManifestEditor } from '../../../../core/models'; -import { UmbContextConsumerMixin } from '../../../../core/context'; -import { createExtensionElement, UmbExtensionRegistry } from '../../../../core/extension'; -import { UmbObserverMixin } from '../../../../core/observer'; +import { UmbObserverMixin } from '@umbraco-cms/observable-api'; +import { createExtensionElement, UmbExtensionRegistry } from '@umbraco-cms/extensions-api'; +import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; +import type { ManifestEditor } from '@umbraco-cms/models'; @customElement('umb-editor-entity') export class UmbEditorEntityElement extends UmbContextConsumerMixin(UmbObserverMixin(LitElement)) { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/node/editor-node.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/node/editor-node.element.ts index 9669160a49..aabd79bf42 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/node/editor-node.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/node/editor-node.element.ts @@ -3,13 +3,13 @@ import { css, html, LitElement, nothing } from 'lit'; import { customElement, property, state } from 'lit/decorators.js'; import { UUIInputElement, UUIInputEvent } from '@umbraco-ui/uui'; import { distinctUntilChanged } from 'rxjs'; -import { UmbContextConsumerMixin, UmbContextProviderMixin } from '../../../../core/context'; import { UmbNodeStore } from '../../../../core/stores/node.store'; -import { NodeEntity } from '../../../../mocks/data/node.data'; +import { NodeEntity } from '../../../../core/mocks/data/node.data'; import type { UmbNotificationService } from '../../../../core/services/notification'; import { UmbNotificationDefaultData } from '../../../../core/services/notification/layouts/default'; -import { UmbObserverMixin } from '../../../../core/observer'; import { UmbNodeContext } from './node.context'; +import { UmbObserverMixin } from '@umbraco-cms/observable-api'; +import { UmbContextConsumerMixin, UmbContextProviderMixin } from '@umbraco-cms/context-api'; import '../../shared/editor-entity-layout/editor-entity-layout.element'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/node/editor-node.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/node/editor-node.stories.ts index 1a41bc301a..5291fec854 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/node/editor-node.stories.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/node/editor-node.stories.ts @@ -3,7 +3,7 @@ import './editor-node.element'; import { Meta, Story } from '@storybook/web-components'; import { html } from 'lit-html'; -import { data } from '../../../../mocks/data/node.data'; +import { data } from '../../../../core/mocks/data/node.data'; import type { UmbEditorNodeElement } from './editor-node.element'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/node/node.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/node/node.context.ts index 2901d8bd09..e5995addc3 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/node/node.context.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/node/node.context.ts @@ -1,5 +1,5 @@ import { BehaviorSubject, Observable } from 'rxjs'; -import { NodeEntity } from '../../../../mocks/data/node.data'; +import { NodeEntity } from '../../../../core/mocks/data/node.data'; export class UmbNodeContext { // TODO: figure out how fine grained we want to make our observables. diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/node/views/edit/editor-view-node-edit.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/node/views/edit/editor-view-node-edit.element.ts index 6cc0083cf8..88b90634ff 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/node/views/edit/editor-view-node-edit.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/node/views/edit/editor-view-node-edit.element.ts @@ -2,12 +2,12 @@ import { html, LitElement } from 'lit'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, state } from 'lit/decorators.js'; import { distinctUntilChanged } from 'rxjs'; -import { NodeEntity, NodeProperty, NodePropertyData } from '../../../../../../mocks/data/node.data'; -import { UmbContextConsumerMixin } from '../../../../../../core/context'; +import { NodeEntity, NodeProperty, NodePropertyData } from '../../../../../../core/mocks/data/node.data'; import { UmbNodeContext } from '../../node.context'; +import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; import '../../../../../components/node-property/node-property.element'; -import { UmbObserverMixin } from '../../../../../../core/observer'; +import { UmbObserverMixin } from '@umbraco-cms/observable-api'; @customElement('umb-editor-view-node-edit') export class UmbEditorViewNodeEditElement extends UmbContextConsumerMixin(UmbObserverMixin(LitElement)) { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/node/views/edit/editor-view-node-edit.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/node/views/edit/editor-view-node-edit.stories.ts index 4a711e89c0..8fd877dbcb 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/node/views/edit/editor-view-node-edit.stories.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/node/views/edit/editor-view-node-edit.stories.ts @@ -3,7 +3,7 @@ import './editor-view-node-edit.element'; import { Meta, Story } from '@storybook/web-components'; import { html } from 'lit-html'; -import { data } from '../../../../../../mocks/data/node.data'; +import { data } from '../../../../../../core/mocks/data/node.data'; import { UmbNodeContext } from '../../node.context'; import type { UmbEditorViewNodeEditElement } from './editor-view-node-edit.element'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/node/views/info/editor-view-node-info.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/node/views/info/editor-view-node-info.element.ts index 7f5becea74..d93394afde 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/node/views/info/editor-view-node-info.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/node/views/info/editor-view-node-info.element.ts @@ -2,10 +2,10 @@ import { css, html, LitElement } from 'lit'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, state } from 'lit/decorators.js'; import { distinctUntilChanged } from 'rxjs'; -import { UmbContextConsumerMixin } from '../../../../../../core/context'; import { UmbNodeContext } from '../../node.context'; -import { UmbObserverMixin } from '../../../../../../core/observer'; -import type { NodeEntity } from '../../../../../../mocks/data/node.data'; +import type { NodeEntity } from '../../../../../../core/mocks/data/node.data'; +import { UmbObserverMixin } from '@umbraco-cms/observable-api'; +import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; @customElement('umb-editor-view-node-info') export class UmbEditorViewNodeInfoElement extends UmbContextConsumerMixin(UmbObserverMixin(LitElement)) { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/node/views/info/editor-view-node-info.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/node/views/info/editor-view-node-info.stories.ts index fb47364eb2..d6da71d954 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/node/views/info/editor-view-node-info.stories.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/node/views/info/editor-view-node-info.stories.ts @@ -3,7 +3,7 @@ import './editor-view-node-info.element'; import { Meta, Story } from '@storybook/web-components'; import { html } from 'lit-html'; -import { data } from '../../../../../../mocks/data/node.data'; +import { data } from '../../../../../../core/mocks/data/node.data'; import { UmbNodeContext } from '../../node.context'; import type { UmbEditorViewNodeInfoElement } from './editor-view-node-info.element'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/user/actions/editor-action-user-save.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/user/actions/editor-action-user-save.element.ts index afab26d7dd..b297ee0121 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/user/actions/editor-action-user-save.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/editors/user/actions/editor-action-user-save.element.ts @@ -1,14 +1,13 @@ -import { css, html, LitElement, nothing } from 'lit'; -import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; +import { css, html, LitElement } from 'lit'; import { customElement, state } from 'lit/decorators.js'; -import { Subscription } from 'rxjs'; -import { UUIButtonState } from '@umbraco-ui/uui'; -import { UmbContextConsumerMixin } from '../../../../core/context'; -import { UmbUserStore } from '../../../../core/stores/user/user.store'; -import type { UserEntity } from '../../../../core/models'; -import { UmbUserContext } from '../user.context'; -import { UmbNotificationDefaultData } from '../../../../core/services/notification/layouts/default'; -import { UmbNotificationService } from '../../../../core/services/notification'; +import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; +import type { UUIButtonState } from '@umbraco-ui/uui'; +import type { UmbUserStore } from '../../../../core/stores/user/user.store'; +import type { UmbUserContext } from '../user.context'; + +import type { UmbNotificationDefaultData } from '../../../../core/services/notification/layouts/default'; +import type { UmbNotificationService } from '../../../../core/services/notification'; +import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; @customElement('umb-editor-action-user-save') export class UmbEditorActionUserSaveElement extends UmbContextConsumerMixin(LitElement) { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/user/editor-user.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/user/editor-user.element.ts index 5361d5d5b1..5814805d3f 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/user/editor-user.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/editors/user/editor-user.element.ts @@ -4,15 +4,16 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, property, state } from 'lit/decorators.js'; import { Subscription } from 'rxjs'; import { ifDefined } from 'lit-html/directives/if-defined.js'; -import { UmbContextProviderMixin, UmbContextConsumerMixin } from '../../../core/context'; -import UmbSectionViewUsersElement from '../../sections/users/views/users/section-view-users.element'; -import { UmbUserStore } from '../../../core/stores/user/user.store'; -import type { UserDetails } from '../../../core/models'; -import { UmbUserContext } from './user.context'; -import '../../property-editor-uis/content-picker/property-editor-ui-content-picker.element'; -import '../shared/editor-entity-layout/editor-entity-layout.element'; +import { UmbUserStore } from '../../../core/stores/user/user.store'; import { getTagLookAndColor } from '../../sections/users/user-extensions'; +import { UmbUserContext } from './user.context'; +import { UmbContextProviderMixin, UmbContextConsumerMixin } from '@umbraco-cms/context-api'; +import type { UserDetails } from '@umbraco-cms/models'; + +import '../../property-editor-uis/content-picker/property-editor-ui-content-picker.element'; +import '../shared/editor-entity-layout/editor-entity-layout.element'; + @customElement('umb-editor-user') export class UmbEditorUserElement extends UmbContextProviderMixin(UmbContextConsumerMixin(LitElement)) { static styles = [ diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/user/user.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/user/user.context.ts index 2f27a60a26..860c31b27a 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/user/user.context.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/editors/user/user.context.ts @@ -1,5 +1,5 @@ import { BehaviorSubject, Observable } from 'rxjs'; -import type { UserDetails } from '../../../core/models'; +import type { UserDetails } from '@umbraco-cms/models'; export class UmbUserContext { // TODO: figure out how fine grained we want to make our observables. diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/property-actions/clear/property-action-clear.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/property-actions/clear/property-action-clear.element.ts index 3a3c6f64d1..8ac1fb578b 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/property-actions/clear/property-action-clear.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/property-actions/clear/property-action-clear.element.ts @@ -1,8 +1,8 @@ import { html, LitElement } from 'lit'; import { customElement, property } from 'lit/decorators.js'; -import { UmbContextConsumerMixin } from '../../../core/context'; import { UmbPropertyActionMenuContext } from '../shared/property-action-menu/property-action-menu.context'; import { UmbPropertyAction } from '../shared/property-action/property-action.model'; +import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; @customElement('umb-property-action-clear') export class UmbPropertyActionClearElement extends UmbContextConsumerMixin(LitElement) implements UmbPropertyAction { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/property-actions/copy/property-action-copy.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/property-actions/copy/property-action-copy.element.ts index 9a52996e5b..d6d7d0223c 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/property-actions/copy/property-action-copy.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/property-actions/copy/property-action-copy.element.ts @@ -1,9 +1,9 @@ import { html, LitElement } from 'lit'; import { customElement, property } from 'lit/decorators.js'; -import { UmbContextConsumerMixin } from '../../../core/context'; import type { UmbNotificationDefaultData } from '../../../core/services/notification/layouts/default'; import type { UmbNotificationService } from '../../../core/services/notification'; import type { UmbPropertyAction } from '../shared/property-action/property-action.model'; +import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; @customElement('umb-property-action-copy') export class UmbPropertyActionCopyElement extends UmbContextConsumerMixin(LitElement) implements UmbPropertyAction { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/property-actions/shared/property-action-menu/property-action-menu.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/property-actions/shared/property-action-menu/property-action-menu.element.ts index d0d2a641aa..a7923535d6 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/property-actions/shared/property-action-menu/property-action-menu.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/property-actions/shared/property-action-menu/property-action-menu.element.ts @@ -1,14 +1,15 @@ -import '../property-action/property-action.element'; - -import { UUITextStyles } from '@umbraco-ui/uui'; import { css, CSSResultGroup, html, LitElement } from 'lit'; import { customElement, property, state } from 'lit/decorators.js'; import { map } from 'rxjs'; -import { UmbContextProviderMixin, UmbContextConsumerMixin } from '../../../../core/context'; -import { UmbExtensionRegistry } from '../../../../core/extension'; -import type { ManifestPropertyAction } from '../../../../core/models'; -import { UmbObserverMixin } from '../../../../core/observer'; +import { UUITextStyles } from '@umbraco-ui/uui'; import { UmbPropertyActionMenuContext } from './property-action-menu.context'; +import { UmbObserverMixin } from '@umbraco-cms/observable-api'; +import { UmbExtensionRegistry } from '@umbraco-cms/extensions-api'; + +import { UmbContextProviderMixin, UmbContextConsumerMixin } from '@umbraco-cms/context-api'; +import type { ManifestPropertyAction } from '@umbraco-cms/models'; + +import '../property-action/property-action.element'; @customElement('umb-property-action-menu') export class UmbPropertyActionMenuElement extends UmbContextProviderMixin( diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/property-actions/shared/property-action/property-action.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/property-actions/shared/property-action/property-action.element.ts index 44ee2a6926..7417cce141 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/property-actions/shared/property-action/property-action.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/property-actions/shared/property-action/property-action.element.ts @@ -1,9 +1,10 @@ -import { UUITextStyles } from '@umbraco-ui/uui'; import { CSSResultGroup, html, LitElement } from 'lit'; import { customElement, property, state } from 'lit/decorators.js'; -import { createExtensionElement } from '../../../../core/extension'; -import type { ManifestPropertyAction } from '../../../../core/models'; +import { UUITextStyles } from '@umbraco-ui/uui'; import type { UmbPropertyAction } from './property-action.model'; +import { createExtensionElement } from '@umbraco-cms/extensions-api'; + +import type { ManifestPropertyAction } from '@umbraco-cms/models'; @customElement('umb-property-action') export class UmbPropertyActionElement extends LitElement implements UmbPropertyAction { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/property-editor-uis/block-list/property-editor-ui-block-list.test.ts b/src/Umbraco.Web.UI.Client/src/backoffice/property-editor-uis/block-list/property-editor-ui-block-list.test.ts index de2b9b5778..ac39d3aefa 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/property-editor-uis/block-list/property-editor-ui-block-list.test.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/property-editor-uis/block-list/property-editor-ui-block-list.test.ts @@ -1,6 +1,6 @@ import { expect, fixture, html } from '@open-wc/testing'; -import { defaultA11yConfig } from '../../../core/helpers/chai'; import { UmbPropertyEditorUIBlockListElement } from './property-editor-ui-block-list.element'; +import { defaultA11yConfig } from '@umbraco-cms/test-utils'; describe('UmbPropertyEditorUIBlockListElement', () => { let element: UmbPropertyEditorUIBlockListElement; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/property-editor-uis/checkbox-list/property-editor-ui-checkbox-list.test.ts b/src/Umbraco.Web.UI.Client/src/backoffice/property-editor-uis/checkbox-list/property-editor-ui-checkbox-list.test.ts index cc4b654e61..629e446eb2 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/property-editor-uis/checkbox-list/property-editor-ui-checkbox-list.test.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/property-editor-uis/checkbox-list/property-editor-ui-checkbox-list.test.ts @@ -1,6 +1,6 @@ import { expect, fixture, html } from '@open-wc/testing'; -import { defaultA11yConfig } from '../../../core/helpers/chai'; import { UmbPropertyEditorUICheckboxListElement } from './property-editor-ui-checkbox-list.element'; +import { defaultA11yConfig } from '@umbraco-cms/test-utils'; describe('UmbPropertyEditorUICheckboxListElement', () => { let element: UmbPropertyEditorUICheckboxListElement; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/property-editor-uis/content-picker/property-editor-ui-content-picker.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/property-editor-uis/content-picker/property-editor-ui-content-picker.element.ts index 6a2f46db1a..55b35a698a 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/property-editor-uis/content-picker/property-editor-ui-content-picker.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/property-editor-uis/content-picker/property-editor-ui-content-picker.element.ts @@ -2,11 +2,11 @@ import { css, html, LitElement, nothing } from 'lit'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, property, state } from 'lit/decorators.js'; -import { UmbContextConsumerMixin } from '../../../core/context'; import type { UmbModalService } from '../../../core/services/modal'; import type { UmbEntityStore } from '../../../core/stores/entity.store'; -import type { Entity } from '../../../mocks/data/entities'; -import { UmbObserverMixin } from '../../../core/observer'; +import type { Entity } from '../../../core/mocks/data/entities'; +import { UmbObserverMixin } from '@umbraco-cms/observable-api'; +import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; @customElement('umb-property-editor-ui-content-picker') export class UmbPropertyEditorUIContentPickerElement extends UmbContextConsumerMixin(UmbObserverMixin(LitElement)) { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/property-editor-uis/icon-picker/property-editor-ui-icon-picker.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/property-editor-uis/icon-picker/property-editor-ui-icon-picker.element.ts index 3c4420a7f4..8e69165199 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/property-editor-uis/icon-picker/property-editor-ui-icon-picker.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/property-editor-uis/icon-picker/property-editor-ui-icon-picker.element.ts @@ -1,8 +1,8 @@ import { html, LitElement } from 'lit'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, property } from 'lit/decorators.js'; -import { UmbContextConsumerMixin } from '../../../core/context'; import type { UmbModalService } from '../../../core/services/modal'; +import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; /** * @element umb-property-editor-ui-icon-picker diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/property-editor-uis/icon-picker/property-editor-ui-icon-picker.test.ts b/src/Umbraco.Web.UI.Client/src/backoffice/property-editor-uis/icon-picker/property-editor-ui-icon-picker.test.ts index 128314c496..fb580afdf9 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/property-editor-uis/icon-picker/property-editor-ui-icon-picker.test.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/property-editor-uis/icon-picker/property-editor-ui-icon-picker.test.ts @@ -1,6 +1,6 @@ import { expect, fixture, html } from '@open-wc/testing'; -import { defaultA11yConfig } from '../../../core/helpers/chai'; import { UmbPropertyEditorUIIconPickerElement } from './property-editor-ui-icon-picker.element'; +import { defaultA11yConfig } from '@umbraco-cms/test-utils'; describe('UmbPropertyEditorUIIconPickerElement', () => { let element: UmbPropertyEditorUIIconPickerElement; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/property-editor-uis/shared/property-editor-config/property-editor-config.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/property-editor-uis/shared/property-editor-config/property-editor-config.element.ts index 6bdbeab48f..d89f3bcddd 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/property-editor-uis/shared/property-editor-config/property-editor-config.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/property-editor-uis/shared/property-editor-config/property-editor-config.element.ts @@ -1,19 +1,15 @@ -import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { html, LitElement } from 'lit'; import { customElement, property, state } from 'lit/decorators.js'; import { ifDefined } from 'lit-html/directives/if-defined.js'; -import { UmbContextConsumerMixin } from '../../../../core/context'; -import { UmbExtensionRegistry } from '../../../../core/extension'; +import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { PropertyEditorConfigRef, UmbPropertyEditorConfigStore, } from '../../../../core/stores/property-editor-config/property-editor-config.store'; -import { UmbObserverMixin } from '../../../../core/observer'; -import type { - ManifestTypes, - PropertyEditorConfigDefaultData, - PropertyEditorConfigProperty, -} from '../../../../core/models'; +import { UmbObserverMixin } from '@umbraco-cms/observable-api'; +import { UmbExtensionRegistry } from '@umbraco-cms/extensions-api'; +import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; +import type { ManifestTypes, PropertyEditorConfigDefaultData, PropertyEditorConfigProperty } from '@umbraco-cms/models'; import '../../../components/entity-property/entity-property.element'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/property-editor-uis/toggle/property-editor-ui-toggle.test.ts b/src/Umbraco.Web.UI.Client/src/backoffice/property-editor-uis/toggle/property-editor-ui-toggle.test.ts index 85aba3b4f0..a46277d546 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/property-editor-uis/toggle/property-editor-ui-toggle.test.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/property-editor-uis/toggle/property-editor-ui-toggle.test.ts @@ -1,6 +1,6 @@ import { expect, fixture, html } from '@open-wc/testing'; -import { defaultA11yConfig } from '../../../core/helpers/chai'; import { UmbPropertyEditorUIToggleElement } from './property-editor-ui-toggle.element'; +import { defaultA11yConfig } from '@umbraco-cms/test-utils'; describe('UmbPropertyEditorUIToggleElement', () => { let element: UmbPropertyEditorUIToggleElement; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/sections/packages/packages-installed-item.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/sections/packages/packages-installed-item.element.ts index 8d38e88ed7..f675fe20ef 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/sections/packages/packages-installed-item.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/sections/packages/packages-installed-item.element.ts @@ -2,11 +2,11 @@ import { html, LitElement, nothing } from 'lit'; import { customElement, property, state } from 'lit/decorators.js'; import { firstValueFrom, map } from 'rxjs'; -import { UmbContextConsumerMixin } from '../../../core/context'; -import { createExtensionElement, UmbExtensionRegistry } from '../../../core/extension'; - -import type { ManifestPackageView, PackageInstalled } from '../../../core/models'; import type { UmbModalService } from '../../../core/services/modal'; +import { createExtensionElement, UmbExtensionRegistry } from '@umbraco-cms/extensions-api'; + +import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; +import type { ManifestPackageView, PackageInstalled } from '@umbraco-cms/models'; @customElement('umb-packages-installed-item') export class UmbPackagesInstalledItem extends UmbContextConsumerMixin(LitElement) { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/sections/packages/packages-installed.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/sections/packages/packages-installed.element.ts index ae4321a076..1e6057d0a3 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/sections/packages/packages-installed.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/sections/packages/packages-installed.element.ts @@ -4,9 +4,9 @@ import { html, LitElement, nothing } from 'lit'; import { customElement, state } from 'lit/decorators.js'; import { repeat } from 'lit/directives/repeat.js'; -import { getPackagesInstalled } from '../../../core/api/fetcher'; +import { getPackagesInstalled } from '@umbraco-cms/backend-api'; -import type { PackageInstalled } from '../../../core/models'; +import type { PackageInstalled } from '@umbraco-cms/models'; @customElement('umb-packages-installed') export class UmbPackagesInstalled extends LitElement { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/sections/packages/packages-section.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/sections/packages/packages-section.element.ts index 6c69595639..677cfa471f 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/sections/packages/packages-section.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/sections/packages/packages-section.element.ts @@ -4,8 +4,8 @@ import { html, LitElement } from 'lit'; import { customElement } from 'lit/decorators.js'; import { IRoute, IRoutingInfo } from 'router-slot'; -import { UmbContextConsumerMixin } from '../../../core/context'; -import { UmbExtensionRegistry } from '../../../core/extension'; +import { UmbExtensionRegistry } from '@umbraco-cms/extensions-api'; +import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; @customElement('umb-packages-section') export class UmbPackagesSection extends UmbContextConsumerMixin(LitElement) { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/sections/section.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/sections/section.context.ts index d7eaef5b2e..5f99b9d74e 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/sections/section.context.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/sections/section.context.ts @@ -1,7 +1,7 @@ import { BehaviorSubject, ReplaySubject } from 'rxjs'; -import type { ManifestSection, ManifestSectionView, ManifestTree } from '../../core/models'; -import { Entity } from '../../mocks/data/entities'; +import { Entity } from '../../core/mocks/data/entities'; +import type { ManifestSection, ManifestSectionView, ManifestTree } from '@umbraco-cms/models'; export class UmbSectionContext { // TODO: figure out how fine grained we want to make our observables. diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/sections/shared/section-dashboards/section-dashboards.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/sections/shared/section-dashboards/section-dashboards.element.ts index 480ec1b8e2..3bfdb59c09 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/sections/shared/section-dashboards/section-dashboards.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/sections/shared/section-dashboards/section-dashboards.element.ts @@ -4,11 +4,12 @@ import { customElement, state } from 'lit/decorators.js'; import { IRoutingInfo } from 'router-slot'; import { first, map } from 'rxjs'; -import { UmbContextConsumerMixin } from '../../../../core/context'; -import { createExtensionElement, UmbExtensionRegistry } from '../../../../core/extension'; import { UmbSectionContext } from '../../section.context'; -import type { ManifestDashboard, ManifestSection } from '../../../../core/models'; -import { UmbObserverMixin } from '../../../../core/observer'; +import { UmbObserverMixin } from '@umbraco-cms/observable-api'; +import { createExtensionElement, UmbExtensionRegistry } from '@umbraco-cms/extensions-api'; +import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; + +import type { ManifestDashboard, ManifestSection } from '@umbraco-cms/models'; @customElement('umb-section-dashboards') export class UmbSectionDashboardsElement extends UmbContextConsumerMixin(UmbObserverMixin(LitElement)) { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/sections/shared/section-dashboards/section-dashboards.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/sections/shared/section-dashboards/section-dashboards.stories.ts index d116cc7dfa..a95d9edc2c 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/sections/shared/section-dashboards/section-dashboards.stories.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/sections/shared/section-dashboards/section-dashboards.stories.ts @@ -1,9 +1,9 @@ import { Meta, Story } from '@storybook/web-components'; import { html } from 'lit-html'; import { internalManifests } from '../../../../temp-internal-manifests'; -import type { ManifestSection } from '../../../../core/models'; import { UmbSectionContext } from '../../section.context'; import type { UmbSectionDashboardsElement } from './section-dashboards.element'; +import type { ManifestSection } from '@umbraco-cms/models'; import './section-dashboards.element'; const contentSectionManifest = internalManifests.find((m) => m.alias === 'Umb.Section.Content') as ManifestSection; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/sections/shared/section-sidebar/section-sidebar.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/sections/shared/section-sidebar/section-sidebar.element.ts index 2bae4a590e..4d019514ad 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/sections/shared/section-sidebar/section-sidebar.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/sections/shared/section-sidebar/section-sidebar.element.ts @@ -1,10 +1,10 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { css, html, LitElement } from 'lit'; import { customElement, state } from 'lit/decorators.js'; -import { UmbContextConsumerMixin } from '../../../../core/context'; import { UmbSectionContext } from '../../section.context'; -import { UmbObserverMixin } from '../../../../core/observer'; -import type { ManifestSection } from '../../../../core/models'; +import { UmbObserverMixin } from '@umbraco-cms/observable-api'; +import type { ManifestSection } from '@umbraco-cms/models'; +import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; import '../../../trees/shared/context-menu/tree-context-menu.service'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/sections/shared/section-trees/section-trees.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/sections/shared/section-trees/section-trees.element.ts index e623c96b7f..20d11fb2fe 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/sections/shared/section-trees/section-trees.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/sections/shared/section-trees/section-trees.element.ts @@ -3,10 +3,10 @@ import { html, LitElement } from 'lit'; import { customElement, state } from 'lit/decorators.js'; import { map, switchMap, EMPTY, of } from 'rxjs'; -import { UmbContextConsumerMixin } from '../../../../core/context'; -import { UmbExtensionRegistry } from '../../../../core/extension'; import { UmbSectionContext } from '../../section.context'; -import { UmbObserverMixin } from '../../../../core/observer'; +import { UmbObserverMixin } from '@umbraco-cms/observable-api'; +import { UmbExtensionRegistry } from '@umbraco-cms/extensions-api'; +import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; import '../../../trees/shared/tree-extension.element'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/sections/shared/section-views/section-views.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/sections/shared/section-views/section-views.element.ts index 675b95245d..d0c9b4f2ec 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/sections/shared/section-views/section-views.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/sections/shared/section-views/section-views.element.ts @@ -2,10 +2,10 @@ import { UUITextStyles } from '@umbraco-ui/uui-css'; import { css, html, LitElement, nothing } from 'lit'; import { customElement, state } from 'lit/decorators.js'; import { EMPTY, map, of, Subscription, switchMap } from 'rxjs'; -import { UmbContextConsumerMixin } from '../../../../core/context'; -import { UmbExtensionRegistry } from '../../../../core/extension'; -import type { ManifestSectionView } from '../../../../core/models'; import { UmbSectionContext } from '../../section.context'; +import { UmbExtensionRegistry } from '@umbraco-cms/extensions-api'; +import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; +import type { ManifestSectionView } from '@umbraco-cms/models'; @customElement('umb-section-views') export class UmbSectionViewsElement extends UmbContextConsumerMixin(LitElement) { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/sections/shared/section.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/sections/shared/section.element.ts index a23ff2b82a..97b6e78dd5 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/sections/shared/section.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/sections/shared/section.element.ts @@ -2,13 +2,13 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { css, html, LitElement, nothing } from 'lit'; import { customElement, state } from 'lit/decorators.js'; import { map, switchMap, EMPTY, of } from 'rxjs'; -import { UmbContextConsumerMixin } from '../../../core/context'; -import { createExtensionElement, UmbExtensionRegistry } from '../../../core/extension'; import { UmbSectionContext } from '../section.context'; -import type { ManifestTree, ManifestSectionView } from '../../../core/models'; import { UmbEditorEntityElement } from '../../editors/shared/editor-entity/editor-entity.element'; import { UmbEntityStore } from '../../../core/stores/entity.store'; -import { UmbObserverMixin } from '../../../core/observer'; +import { UmbObserverMixin } from '@umbraco-cms/observable-api'; +import { createExtensionElement, UmbExtensionRegistry } from '@umbraco-cms/extensions-api'; +import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; +import type { ManifestTree, ManifestSectionView } from '@umbraco-cms/models'; import './section-trees/section-trees.element.ts'; import '../shared/section-views/section-views.element.ts'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/user-groups/editor-view-user-groups.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/user-groups/editor-view-user-groups.element.ts index aba414a2a9..ed79c0b9c5 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/user-groups/editor-view-user-groups.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/user-groups/editor-view-user-groups.element.ts @@ -2,8 +2,6 @@ import { UUITextStyles } from '@umbraco-ui/uui-css'; import { css, html, LitElement } from 'lit'; import { customElement, state } from 'lit/decorators.js'; import { Subscription } from 'rxjs'; -import { UmbContextConsumerMixin } from '../../../../../core/context'; -import type { UserGroupDetails } from '../../../../../core/models'; import { UmbUserGroupStore } from '../../../../../core/stores/user/user-group.store'; import UmbTableElement, { UmbTableColumn, @@ -13,6 +11,8 @@ import UmbTableElement, { UmbTableOrderedEvent, UmbTableSelectedEvent, } from '../../../../components/table/table.element'; +import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; +import type { UserGroupDetails } from '@umbraco-cms/models'; import './user-group-table-name-column-layout.element'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/editor-view-users-invite.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/editor-view-users-invite.element.ts index fdedfa1de1..d3a1b42720 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/editor-view-users-invite.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/editor-view-users-invite.element.ts @@ -1,11 +1,11 @@ import { css, html, nothing } from 'lit'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, query, state } from 'lit/decorators.js'; -import { UmbContextConsumerMixin } from '../../../../../core/context'; import { UmbModalLayoutElement } from '../../../../../core/services/modal/layouts/modal-layout.element'; import { UmbUserStore } from '../../../../../core/stores/user/user.store'; -import type { UserDetails } from '../../../../../core/models'; import { UmbNotificationService } from '../../../../../core/services/notification'; +import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; +import type { UserDetails } from '@umbraco-cms/models'; export type UsersViewType = 'list' | 'grid'; @customElement('umb-editor-view-users-invite') diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/editor-view-users-overview.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/editor-view-users-overview.element.ts index 8cac749dab..c055488ea9 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/editor-view-users-overview.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/editor-view-users-overview.element.ts @@ -8,9 +8,9 @@ import './editor-view-users-selection.element'; import './editor-view-users-invite.element'; import { IRoute } from 'router-slot'; import { UUIPopoverElement } from '@umbraco-ui/uui'; -import { UmbContextConsumerMixin } from '../../../../../core/context'; import { UmbModalService } from '../../../../../core/services/modal'; import UmbSectionViewUsersElement from './section-view-users.element'; +import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; export type UsersViewType = 'list' | 'grid'; @customElement('umb-editor-view-users-overview') diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/editor-view-users-selection.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/editor-view-users-selection.element.ts index 16a5d8c3d8..0676a8cddf 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/editor-view-users-selection.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/editor-view-users-selection.element.ts @@ -2,9 +2,9 @@ import { css, html, LitElement } from 'lit'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, state } from 'lit/decorators.js'; import { Subscription } from 'rxjs'; -import { UmbContextConsumerMixin } from '../../../../../core/context'; import type { UmbUserStore } from '../../../../../core/stores/user/user.store'; import { UmbSectionViewUsersElement } from './section-view-users.element'; +import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; @customElement('umb-editor-view-users-selection') export class UmbEditorViewUsersSelectionElement extends UmbContextConsumerMixin(LitElement) { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/list-view-layouts/grid/editor-view-users-grid.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/list-view-layouts/grid/editor-view-users-grid.element.ts index f67c85d3d0..5193831ec3 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/list-view-layouts/grid/editor-view-users-grid.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/list-view-layouts/grid/editor-view-users-grid.element.ts @@ -4,11 +4,11 @@ import { customElement, state } from 'lit/decorators.js'; import { repeat } from 'lit/directives/repeat.js'; import { Subscription } from 'rxjs'; import { ifDefined } from 'lit-html/directives/if-defined.js'; -import { UmbContextConsumerMixin } from '../../../../../../../core/context'; import UmbSectionViewUsersElement from '../../section-view-users.element'; import { UmbUserStore } from '../../../../../../../core/stores/user/user.store'; -import type { UserDetails, UserEntity } from '../../../../../../../core/models'; import { getTagLookAndColor } from '../../../../user-extensions'; +import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; +import type { UserDetails, UserEntity } from '@umbraco-cms/models'; @customElement('umb-editor-view-users-grid') export class UmbEditorViewUsersGridElement extends UmbContextConsumerMixin(LitElement) { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/list-view-layouts/table/editor-view-users-table.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/list-view-layouts/table/editor-view-users-table.element.ts index b68be8bec1..9592318b80 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/list-view-layouts/table/editor-view-users-table.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/list-view-layouts/table/editor-view-users-table.element.ts @@ -2,10 +2,8 @@ import { css, html, LitElement } from 'lit'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, state } from 'lit/decorators.js'; import { Subscription } from 'rxjs'; -import { UmbContextConsumerMixin } from '../../../../../../../core/context'; import type { UmbSectionViewUsersElement } from '../../section-view-users.element'; import { UmbUserStore } from '../../../../../../../core/stores/user/user.store'; -import type { UserDetails } from '../../../../../../../core/models'; import { UmbTableElement, UmbTableColumn, @@ -15,6 +13,8 @@ import { UmbTableConfig, UmbTableOrderedEvent, } from '../../../../../../components/table/table.element'; +import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; +import type { UserDetails } from '@umbraco-cms/models'; import './column-layouts/name/user-table-name-column-layout.element'; import './column-layouts/status/user-table-status-column-layout.element'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/section-view-users.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/section-view-users.element.ts index 9208c9dd62..b00ed10371 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/section-view-users.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/sections/users/views/users/section-view-users.element.ts @@ -3,8 +3,8 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, state } from 'lit/decorators.js'; import { BehaviorSubject, Observable } from 'rxjs'; import type { IRoute, IRoutingInfo } from 'router-slot'; -import { UmbContextProviderMixin } from '../../../../../core/context'; import type { UmbEditorEntityElement } from '../../../../editors/shared/editor-entity/editor-entity.element'; +import { UmbContextProviderMixin } from '@umbraco-cms/context-api'; import './list-view-layouts/table/editor-view-users-table.element'; import './list-view-layouts/grid/editor-view-users-grid.element'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/trees/data-types/actions/action-data-type-delete.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/data-types/actions/action-data-type-delete.element.ts index fd615d6e03..f2d2b13264 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/trees/data-types/actions/action-data-type-delete.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/trees/data-types/actions/action-data-type-delete.element.ts @@ -1,10 +1,10 @@ import { UUITextStyles } from '@umbraco-ui/uui-css'; import { css, html } from 'lit'; import { customElement } from 'lit/decorators.js'; -import { UmbContextConsumerMixin } from '../../../../core/context'; import { UmbModalService } from '../../../../core/services/modal'; import { UmbDataTypeStore } from '../../../../core/stores/data-type/data-type.store'; import UmbTreeItemActionElement from '../../shared/tree-item-action.element'; +import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; @customElement('umb-tree-action-data-type-delete') export default class UmbTreeActionDataTypeDeleteElement extends UmbContextConsumerMixin(UmbTreeItemActionElement) { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/trees/data-types/tree-data-types.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/data-types/tree-data-types.element.ts index be8ada6606..7486751f8f 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/trees/data-types/tree-data-types.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/trees/data-types/tree-data-types.element.ts @@ -1,9 +1,9 @@ import { html } from 'lit'; import { customElement } from 'lit/decorators.js'; -import { UmbContextConsumerMixin, UmbContextProviderMixin } from '../../../core/context'; import { UmbEntityStore } from '../../../core/stores/entity.store'; import { UmbTreeBase } from '../shared/tree-base.element'; import { UmbTreeDataTypesDataContext } from './tree-data-types-data.context'; +import { UmbContextConsumerMixin, UmbContextProviderMixin } from '@umbraco-cms/context-api'; import '../shared/tree-navigator.element'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/trees/document-types/tree-document-types.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/document-types/tree-document-types.element.ts index 6687e1c19c..a5d173e499 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/trees/document-types/tree-document-types.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/trees/document-types/tree-document-types.element.ts @@ -1,9 +1,9 @@ import { html } from 'lit'; import { customElement } from 'lit/decorators.js'; -import { UmbContextConsumerMixin, UmbContextProviderMixin } from '../../../core/context'; import { UmbEntityStore } from '../../../core/stores/entity.store'; import { UmbTreeBase } from '../shared/tree-base.element'; import { UmbTreeDocumentTypesDataContext } from './tree-document-types-data.context'; +import { UmbContextConsumerMixin, UmbContextProviderMixin } from '@umbraco-cms/context-api'; import '../shared/tree-navigator.element'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/trees/documents/actions/action-document-delete.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/documents/actions/action-document-delete.element.ts index 46cd22ebb3..4e93c0806d 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/trees/documents/actions/action-document-delete.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/trees/documents/actions/action-document-delete.element.ts @@ -1,10 +1,10 @@ import { UUITextStyles } from '@umbraco-ui/uui-css'; import { css, html } from 'lit'; import { customElement } from 'lit/decorators.js'; -import { UmbContextConsumerMixin } from '../../../../core/context'; import { UmbModalService } from '../../../../core/services/modal'; import { UmbNodeStore } from '../../../../core/stores/node.store'; import UmbTreeItemActionElement from '../../shared/tree-item-action.element'; +import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; @customElement('umb-tree-action-document-delete') export default class UmbTreeActionDocumentDeleteElement extends UmbContextConsumerMixin(UmbTreeItemActionElement) { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/trees/documents/tree-documents.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/documents/tree-documents.element.ts index 9b565215ac..3874e4fa36 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/trees/documents/tree-documents.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/trees/documents/tree-documents.element.ts @@ -1,9 +1,9 @@ import { html } from 'lit'; import { customElement } from 'lit/decorators.js'; -import { UmbContextConsumerMixin, UmbContextProviderMixin } from '../../../core/context'; import { UmbEntityStore } from '../../../core/stores/entity.store'; import { UmbTreeBase } from '../shared/tree-base.element'; import { UmbTreeDocumentDataContext } from './tree-documents-data.context'; +import { UmbContextConsumerMixin, UmbContextProviderMixin } from '@umbraco-cms/context-api'; import '../shared/tree-navigator.element'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/trees/extensions/tree-extensions.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/extensions/tree-extensions.element.ts index 6fc05b3ce7..3d0a6113d3 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/trees/extensions/tree-extensions.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/trees/extensions/tree-extensions.element.ts @@ -1,9 +1,9 @@ import { html } from 'lit'; import { customElement } from 'lit/decorators.js'; -import { UmbContextConsumerMixin, UmbContextProviderMixin } from '../../../core/context'; import { UmbEntityStore } from '../../../core/stores/entity.store'; import { UmbTreeBase } from '../shared/tree-base.element'; import { UmbTreeExtensionsDataContext } from './tree-extensions-data.context'; +import { UmbContextConsumerMixin, UmbContextProviderMixin } from '@umbraco-cms/context-api'; import '../shared/tree-navigator.element'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/trees/media/tree-media.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/media/tree-media.element.ts index 05914fca5a..ac9986a7ed 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/trees/media/tree-media.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/trees/media/tree-media.element.ts @@ -1,9 +1,9 @@ import { html } from 'lit'; import { customElement } from 'lit/decorators.js'; -import { UmbContextConsumerMixin, UmbContextProviderMixin } from '../../../core/context'; import { UmbEntityStore } from '../../../core/stores/entity.store'; import { UmbTreeBase } from '../shared/tree-base.element'; import { UmbTreeMediaDataContext } from './tree-media-data.context'; +import { UmbContextConsumerMixin, UmbContextProviderMixin } from '@umbraco-cms/context-api'; import '../shared/tree-navigator.element'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/trees/member-groups/tree-member-groups.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/member-groups/tree-member-groups.element.ts index 4382b5b7bb..61f5cd0d94 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/trees/member-groups/tree-member-groups.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/trees/member-groups/tree-member-groups.element.ts @@ -1,9 +1,9 @@ import { html } from 'lit'; import { customElement } from 'lit/decorators.js'; -import { UmbContextConsumerMixin, UmbContextProviderMixin } from '../../../core/context'; import { UmbTreeBase } from '../shared/tree-base.element'; import { UmbEntityStore } from '../../../core/stores/entity.store'; import { UmbTreeMemberGroupsDataContext } from './tree-member-groups-data.context'; +import { UmbContextConsumerMixin, UmbContextProviderMixin } from '@umbraco-cms/context-api'; import '../shared/tree-navigator.element'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/trees/members/tree-members.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/members/tree-members.element.ts index 3241fb8636..962f9aaa3a 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/trees/members/tree-members.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/trees/members/tree-members.element.ts @@ -1,9 +1,9 @@ import { html } from 'lit'; import { customElement } from 'lit/decorators.js'; -import { UmbContextConsumerMixin, UmbContextProviderMixin } from '../../../core/context'; import { UmbEntityStore } from '../../../core/stores/entity.store'; import { UmbTreeBase } from '../shared/tree-base.element'; import { UmbTreeMembersDataContext } from './tree-members.context'; +import { UmbContextConsumerMixin, UmbContextProviderMixin } from '@umbraco-cms/context-api'; import '../shared/tree-navigator.element'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/context-menu/tree-context-menu-page-action-list.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/context-menu/tree-context-menu-page-action-list.element.ts index 85b56fed32..85d27f08d9 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/context-menu/tree-context-menu-page-action-list.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/context-menu/tree-context-menu-page-action-list.element.ts @@ -2,12 +2,12 @@ import { css, html, LitElement } from 'lit'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, state } from 'lit/decorators.js'; import { map } from 'rxjs'; -import type { ManifestTreeItemAction, ManifestTree } from '../../../../core/models'; -import { UmbExtensionRegistry } from '../../../../core/extension'; -import { UmbContextConsumerMixin } from '../../../../core/context'; import { UmbSectionContext } from '../../../sections/section.context'; -import { Entity } from '../../../../mocks/data/entities'; -import { UmbObserverMixin } from '../../../../core/observer'; +import { Entity } from '../../../../core/mocks/data/entities'; +import { UmbObserverMixin } from '@umbraco-cms/observable-api'; +import { UmbExtensionRegistry } from '@umbraco-cms/extensions-api'; +import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; +import type { ManifestTreeItemAction, ManifestTree } from '@umbraco-cms/models'; @customElement('umb-tree-context-menu-page-action-list') export class UmbTreeContextMenuPageActionListElement extends UmbContextConsumerMixin(UmbObserverMixin(LitElement)) { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/context-menu/tree-context-menu-page.service.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/context-menu/tree-context-menu-page.service.ts index 46a70487c5..96d6c648f4 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/context-menu/tree-context-menu-page.service.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/context-menu/tree-context-menu-page.service.ts @@ -2,8 +2,8 @@ import { UUITextStyles } from '@umbraco-ui/uui-css'; import { css, LitElement, nothing, PropertyValueMap } from 'lit'; import { customElement, property, state } from 'lit/decorators.js'; import { BehaviorSubject, Observable } from 'rxjs'; -import { UmbContextProviderMixin } from '../../../../core/context'; import UmbTreeItemActionElement, { ActionPageEntity } from '../tree-item-action.element'; +import { UmbContextProviderMixin } from '@umbraco-cms/context-api'; @customElement('umb-tree-context-menu-page-service') export class UmbTreeContextMenuPageService extends UmbContextProviderMixin(LitElement) { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/context-menu/tree-context-menu.service.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/context-menu/tree-context-menu.service.ts index 149b14de6f..9186306a49 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/context-menu/tree-context-menu.service.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/context-menu/tree-context-menu.service.ts @@ -1,9 +1,9 @@ import { UUITextStyles } from '@umbraco-ui/uui-css'; import { css, html, LitElement, nothing } from 'lit'; import { customElement, state } from 'lit/decorators.js'; -import { UmbContextProviderMixin } from '../../../../core/context'; - import { ActionPageEntity } from '../tree-item-action.element'; +import { UmbContextProviderMixin } from '@umbraco-cms/context-api'; + @customElement('umb-tree-context-menu-service') export class UmbTreeContextMenuService extends UmbContextProviderMixin(LitElement) { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/tree-base.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/tree-base.element.ts index c466adb6e0..b171335bac 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/tree-base.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/tree-base.element.ts @@ -1,8 +1,8 @@ import { LitElement } from 'lit'; import { customElement, property } from 'lit/decorators.js'; -import type { ManifestTree } from '../../../core/models'; import { UmbEntityStore } from '../../../core/stores/entity.store'; import { UmbTreeDataContext } from '../tree-data.context'; +import type { ManifestTree } from '@umbraco-cms/models'; @customElement('umb-tree-base') export class UmbTreeBase extends LitElement { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/tree-extension.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/tree-extension.element.ts index 4d91d0a259..81c0daff12 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/tree-extension.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/tree-extension.element.ts @@ -1,8 +1,8 @@ import { CSSResultGroup, html, LitElement } from 'lit'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, property, state } from 'lit/decorators.js'; -import { createExtensionElement } from '../../../core/extension'; -import type { ManifestTree } from '../../../core/models'; +import { createExtensionElement } from '@umbraco-cms/extensions-api'; +import type { ManifestTree } from '@umbraco-cms/models'; import './context-menu/tree-context-menu-page-action-list.element'; import './context-menu/tree-context-menu-page.service'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/tree-item-action-extension.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/tree-item-action-extension.element.ts index a03d92f03b..3bb8e31897 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/tree-item-action-extension.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/tree-item-action-extension.element.ts @@ -2,8 +2,8 @@ import { UUITextStyles } from '@umbraco-ui/uui'; import { CSSResultGroup, html, LitElement } from 'lit'; import { customElement, property, state } from 'lit/decorators.js'; -import { createExtensionElement } from '../../../core/extension'; -import type { ManifestTreeItemAction } from '../../../core/models'; +import { createExtensionElement } from '@umbraco-cms/extensions-api'; +import type { ManifestTreeItemAction } from '@umbraco-cms/models'; @customElement('umb-tree-item-action-extension') export class UmbTreeItemActionExtensionElement extends LitElement { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/tree-item-action.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/tree-item-action.element.ts index e0d0685cad..e4833c0ce7 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/tree-item-action.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/tree-item-action.element.ts @@ -1,12 +1,12 @@ import { LitElement } from 'lit'; import { customElement, property, state } from 'lit/decorators.js'; -import { UmbContextConsumerMixin } from '../../../core/context'; -import type { ManifestTreeItemAction, ManifestTree } from '../../../core/models'; -import { UmbObserverMixin } from '../../../core/observer'; -import { Entity } from '../../../mocks/data/entities'; +import { Entity } from '../../../core/mocks/data/entities'; import { UmbSectionContext } from '../../sections/section.context'; import { UmbTreeContextMenuPageService } from './context-menu/tree-context-menu-page.service'; import { UmbTreeContextMenuService } from './context-menu/tree-context-menu.service'; +import { UmbObserverMixin } from '@umbraco-cms/observable-api'; +import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; +import type { ManifestTreeItemAction, ManifestTree } from '@umbraco-cms/models'; export type ActionPageEntity = { key: string; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/tree-item.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/tree-item.element.ts index 9bfd3734b0..81a55876eb 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/tree-item.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/tree-item.element.ts @@ -4,14 +4,14 @@ import { customElement, property, state } from 'lit/decorators.js'; import { UUIMenuItemEvent } from '@umbraco-ui/uui'; import { map } from 'rxjs'; import { repeat } from 'lit/directives/repeat.js'; -import { UmbContextConsumerMixin } from '../../../core/context'; import { UmbTreeContextBase } from '../tree.context'; import { UmbSectionContext } from '../../sections/section.context'; -import { Entity } from '../../../mocks/data/entities'; -import { UmbObserverMixin } from '../../../core/observer'; +import { Entity } from '../../../core/mocks/data/entities'; import type { ManifestSection } from '../../../core/models'; import { UmbTreeDataContextBase } from '../tree-data.context'; import { UmbTreeContextMenuService } from './context-menu/tree-context-menu.service'; +import { UmbObserverMixin } from '@umbraco-cms/observable-api'; +import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; @customElement('umb-tree-item') export class UmbTreeItem extends UmbContextConsumerMixin(UmbObserverMixin(LitElement)) { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/tree-navigator.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/tree-navigator.element.ts index 863de76417..aff505a456 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/tree-navigator.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/tree-navigator.element.ts @@ -2,10 +2,10 @@ import { css, html, LitElement } from 'lit'; import { repeat } from 'lit/directives/repeat.js'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, state } from 'lit/decorators.js'; -import { UmbContextConsumerMixin } from '../../../core/context'; -import { Entity } from '../../../mocks/data/entities'; -import { UmbObserverMixin } from '../../../core/observer'; +import { Entity } from '../../../core/mocks/data/entities'; import { UmbTreeDataContextBase } from '../tree-data.context'; +import { UmbObserverMixin } from '@umbraco-cms/observable-api'; +import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; import './tree-item.element'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/tree.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/tree.element.ts index e54c508201..b24f5e1a4b 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/tree.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/tree.element.ts @@ -2,11 +2,11 @@ import { html, LitElement } from 'lit'; import { when } from 'lit-html/directives/when.js'; import { customElement, property, state } from 'lit/decorators.js'; import { map } from 'rxjs'; -import { UmbContextConsumerMixin, UmbContextProviderMixin } from '../../../core/context'; -import { UmbExtensionRegistry } from '../../../core/extension'; -import type { ManifestTree } from '../../../core/models'; -import { UmbObserverMixin } from '../../../core/observer'; import { UmbTreeContextBase } from '../tree.context'; +import { UmbObserverMixin } from '@umbraco-cms/observable-api'; +import { UmbExtensionRegistry } from '@umbraco-cms/extensions-api'; +import { UmbContextConsumerMixin, UmbContextProviderMixin } from '@umbraco-cms/context-api'; +import type { ManifestTree } from '@umbraco-cms/models'; @customElement('umb-tree') export class UmbTreeElement extends UmbContextProviderMixin(UmbContextConsumerMixin(UmbObserverMixin(LitElement))) { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/trees/tree-data.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/tree-data.context.ts index de8b53c117..9f8cb471aa 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/trees/tree-data.context.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/trees/tree-data.context.ts @@ -1,6 +1,6 @@ import { map, Observable } from 'rxjs'; import type { UmbEntityStore } from '../../core/stores/entity.store'; -import { Entity } from '../../mocks/data/entities'; +import { Entity } from '../../core/mocks/data/entities'; export interface UmbTreeDataContext { rootKey: string; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/trees/tree.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/tree.context.ts index 7281d349b2..91ee2535bd 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/trees/tree.context.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/trees/tree.context.ts @@ -1,5 +1,5 @@ import { BehaviorSubject, Observable } from 'rxjs'; -import type { ManifestTree } from '../../core/models'; +import type { ManifestTree } from '@umbraco-cms/models'; export interface UmbTreeContext { tree: ManifestTree; diff --git a/src/Umbraco.Web.UI.Client/src/core/api/fetcher.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/fetcher.ts similarity index 99% rename from src/Umbraco.Web.UI.Client/src/core/api/fetcher.ts rename to src/Umbraco.Web.UI.Client/src/core/backend-api/fetcher.ts index 9a45dc0f8e..2934e36a4b 100644 --- a/src/Umbraco.Web.UI.Client/src/core/api/fetcher.ts +++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/fetcher.ts @@ -25,7 +25,6 @@ export const getConsentLevels = fetcher.path('/telemetry/ConsentLevels').method( export const getConsentLevel = fetcher.path('/telemetry/ConsentLevel').method('get').create(); export const postConsentLevel = fetcher.path('/telemetry/ConsentLevel').method('post').create(); - // Property Editors export const getPropertyEditorsList = fetcher.path('/property-editors/list').method('get').create(); export const getPropertyEditor = fetcher @@ -40,4 +39,3 @@ export const getPublishedCacheStatus = fetcher.path('/published-cache/status').m export const postPublishedCacheReload = fetcher.path('/published-cache/reload').method('post').create(); export const postPublishedCacheRebuild = fetcher.path('/published-cache/rebuild').method('post').create(); export const getPublishedCacheCollect = fetcher.path('/published-cache/collect').method('get').create(); - diff --git a/src/Umbraco.Web.UI.Client/src/core/backend-api/index.ts b/src/Umbraco.Web.UI.Client/src/core/backend-api/index.ts new file mode 100644 index 0000000000..00e3d22222 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/core/backend-api/index.ts @@ -0,0 +1 @@ +export * from './fetcher'; diff --git a/src/Umbraco.Web.UI.Client/src/core/context/consume/context-consumer.mixin.ts b/src/Umbraco.Web.UI.Client/src/core/context-api/consume/context-consumer.mixin.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/context/consume/context-consumer.mixin.ts rename to src/Umbraco.Web.UI.Client/src/core/context-api/consume/context-consumer.mixin.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/context/consume/context-consumer.test.ts b/src/Umbraco.Web.UI.Client/src/core/context-api/consume/context-consumer.test.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/context/consume/context-consumer.test.ts rename to src/Umbraco.Web.UI.Client/src/core/context-api/consume/context-consumer.test.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/context/consume/context-consumer.ts b/src/Umbraco.Web.UI.Client/src/core/context-api/consume/context-consumer.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/context/consume/context-consumer.ts rename to src/Umbraco.Web.UI.Client/src/core/context-api/consume/context-consumer.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/context/consume/context-request.event.test.ts b/src/Umbraco.Web.UI.Client/src/core/context-api/consume/context-request.event.test.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/context/consume/context-request.event.test.ts rename to src/Umbraco.Web.UI.Client/src/core/context-api/consume/context-request.event.test.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/context/consume/context-request.event.ts b/src/Umbraco.Web.UI.Client/src/core/context-api/consume/context-request.event.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/context/consume/context-request.event.ts rename to src/Umbraco.Web.UI.Client/src/core/context-api/consume/context-request.event.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/context/index.ts b/src/Umbraco.Web.UI.Client/src/core/context-api/index.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/context/index.ts rename to src/Umbraco.Web.UI.Client/src/core/context-api/index.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/context/provide/context-provide.event.test.ts b/src/Umbraco.Web.UI.Client/src/core/context-api/provide/context-provide.event.test.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/context/provide/context-provide.event.test.ts rename to src/Umbraco.Web.UI.Client/src/core/context-api/provide/context-provide.event.test.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/context/provide/context-provide.event.ts b/src/Umbraco.Web.UI.Client/src/core/context-api/provide/context-provide.event.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/context/provide/context-provide.event.ts rename to src/Umbraco.Web.UI.Client/src/core/context-api/provide/context-provide.event.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/context/provide/context-provider.element.test.ts b/src/Umbraco.Web.UI.Client/src/core/context-api/provide/context-provider.element.test.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/context/provide/context-provider.element.test.ts rename to src/Umbraco.Web.UI.Client/src/core/context-api/provide/context-provider.element.test.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/context/provide/context-provider.element.ts b/src/Umbraco.Web.UI.Client/src/core/context-api/provide/context-provider.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/context/provide/context-provider.element.ts rename to src/Umbraco.Web.UI.Client/src/core/context-api/provide/context-provider.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/context/provide/context-provider.mixin.test.ts b/src/Umbraco.Web.UI.Client/src/core/context-api/provide/context-provider.mixin.test.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/context/provide/context-provider.mixin.test.ts rename to src/Umbraco.Web.UI.Client/src/core/context-api/provide/context-provider.mixin.test.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/context/provide/context-provider.mixin.ts b/src/Umbraco.Web.UI.Client/src/core/context-api/provide/context-provider.mixin.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/context/provide/context-provider.mixin.ts rename to src/Umbraco.Web.UI.Client/src/core/context-api/provide/context-provider.mixin.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/context/provide/context-provider.test.ts b/src/Umbraco.Web.UI.Client/src/core/context-api/provide/context-provider.test.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/context/provide/context-provider.test.ts rename to src/Umbraco.Web.UI.Client/src/core/context-api/provide/context-provider.test.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/context/provide/context-provider.ts b/src/Umbraco.Web.UI.Client/src/core/context-api/provide/context-provider.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/context/provide/context-provider.ts rename to src/Umbraco.Web.UI.Client/src/core/context-api/provide/context-provider.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/css/custom-properties.css b/src/Umbraco.Web.UI.Client/src/core/css/custom-properties.css new file mode 100644 index 0000000000..43f24a9590 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/core/css/custom-properties.css @@ -0,0 +1,5 @@ +@import '@umbraco-ui/uui-css/dist/uui-css.css'; + +:root { + --uui-color-positive: #1c874c; +} diff --git a/src/Umbraco.Web.UI.Client/src/core/extension/create-extension-element.function.ts b/src/Umbraco.Web.UI.Client/src/core/extensions-api/create-extension-element.function.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/extension/create-extension-element.function.ts rename to src/Umbraco.Web.UI.Client/src/core/extensions-api/create-extension-element.function.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/extension/has-default-export.function.ts b/src/Umbraco.Web.UI.Client/src/core/extensions-api/has-default-export.function.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/extension/has-default-export.function.ts rename to src/Umbraco.Web.UI.Client/src/core/extensions-api/has-default-export.function.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/extension/index.ts b/src/Umbraco.Web.UI.Client/src/core/extensions-api/index.ts similarity index 61% rename from src/Umbraco.Web.UI.Client/src/core/extension/index.ts rename to src/Umbraco.Web.UI.Client/src/core/extensions-api/index.ts index 2c6c0f8315..26620ce6e2 100644 --- a/src/Umbraco.Web.UI.Client/src/core/extension/index.ts +++ b/src/Umbraco.Web.UI.Client/src/core/extensions-api/index.ts @@ -1,3 +1,5 @@ export * from './registry/extension.registry'; export * from './create-extension-element.function'; +export * from './has-default-export.function'; +export * from './is-extension.function'; export * from './load-extension.function'; diff --git a/src/Umbraco.Web.UI.Client/src/core/extension/is-extension.function.ts b/src/Umbraco.Web.UI.Client/src/core/extensions-api/is-extension.function.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/extension/is-extension.function.ts rename to src/Umbraco.Web.UI.Client/src/core/extensions-api/is-extension.function.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/extension/load-extension.function.ts b/src/Umbraco.Web.UI.Client/src/core/extensions-api/load-extension.function.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/extension/load-extension.function.ts rename to src/Umbraco.Web.UI.Client/src/core/extensions-api/load-extension.function.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/extension/registry/extension.registry.test.ts b/src/Umbraco.Web.UI.Client/src/core/extensions-api/registry/extension.registry.test.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/extension/registry/extension.registry.test.ts rename to src/Umbraco.Web.UI.Client/src/core/extensions-api/registry/extension.registry.test.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/extension/registry/extension.registry.ts b/src/Umbraco.Web.UI.Client/src/core/extensions-api/registry/extension.registry.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/extension/registry/extension.registry.ts rename to src/Umbraco.Web.UI.Client/src/core/extensions-api/registry/extension.registry.ts diff --git a/src/Umbraco.Web.UI.Client/src/mocks/browser-handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/browser-handlers.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/mocks/browser-handlers.ts rename to src/Umbraco.Web.UI.Client/src/core/mocks/browser-handlers.ts diff --git a/src/Umbraco.Web.UI.Client/src/mocks/browser.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/browser.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/mocks/browser.ts rename to src/Umbraco.Web.UI.Client/src/core/mocks/browser.ts diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/data-type.data.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/data/data-type.data.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/mocks/data/data-type.data.ts rename to src/Umbraco.Web.UI.Client/src/core/mocks/data/data-type.data.ts diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/data.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/data/data.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/mocks/data/data.ts rename to src/Umbraco.Web.UI.Client/src/core/mocks/data/data.ts diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/document-type.data.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/data/document-type.data.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/mocks/data/document-type.data.ts rename to src/Umbraco.Web.UI.Client/src/core/mocks/data/document-type.data.ts diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/entities.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/data/entities.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/mocks/data/entities.ts rename to src/Umbraco.Web.UI.Client/src/core/mocks/data/entities.ts diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/entity.data.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/data/entity.data.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/mocks/data/entity.data.ts rename to src/Umbraco.Web.UI.Client/src/core/mocks/data/entity.data.ts diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/node.data.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/data/node.data.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/mocks/data/node.data.ts rename to src/Umbraco.Web.UI.Client/src/core/mocks/data/node.data.ts diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/property-editor.data.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/data/property-editor.data.ts similarity index 99% rename from src/Umbraco.Web.UI.Client/src/mocks/data/property-editor.data.ts rename to src/Umbraco.Web.UI.Client/src/core/mocks/data/property-editor.data.ts index 009f1334fb..bae4662279 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/property-editor.data.ts +++ b/src/Umbraco.Web.UI.Client/src/core/mocks/data/property-editor.data.ts @@ -1,6 +1,6 @@ import { cloneDeep } from 'lodash'; -import type { PropertyEditor } from '../../core/models'; import { UmbData } from './data'; +import type { PropertyEditor } from '@umbraco-cms/models'; export const data: Array = [ { diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/users.data.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/data/users.data.ts similarity index 99% rename from src/Umbraco.Web.UI.Client/src/mocks/data/users.data.ts rename to src/Umbraco.Web.UI.Client/src/core/mocks/data/users.data.ts index 3d2e36fdca..571f81e118 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/users.data.ts +++ b/src/Umbraco.Web.UI.Client/src/core/mocks/data/users.data.ts @@ -1,5 +1,5 @@ -import type { UserDetails } from '../../core/models'; import { UmbEntityData } from './entity.data'; +import type { UserDetails } from '@umbraco-cms/models'; // Temp mocked database class UmbUsersData extends UmbEntityData { diff --git a/src/Umbraco.Web.UI.Client/src/mocks/domains/data-type.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/data-type.handlers.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/mocks/domains/data-type.handlers.ts rename to src/Umbraco.Web.UI.Client/src/core/mocks/domains/data-type.handlers.ts diff --git a/src/Umbraco.Web.UI.Client/src/mocks/domains/document-type.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/document-type.handlers.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/mocks/domains/document-type.handlers.ts rename to src/Umbraco.Web.UI.Client/src/core/mocks/domains/document-type.handlers.ts diff --git a/src/Umbraco.Web.UI.Client/src/mocks/domains/entity.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/entity.handlers.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/mocks/domains/entity.handlers.ts rename to src/Umbraco.Web.UI.Client/src/core/mocks/domains/entity.handlers.ts diff --git a/src/Umbraco.Web.UI.Client/src/mocks/domains/install.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/install.handlers.ts similarity index 97% rename from src/Umbraco.Web.UI.Client/src/mocks/domains/install.handlers.ts rename to src/Umbraco.Web.UI.Client/src/core/mocks/domains/install.handlers.ts index 897c3183ca..7141897592 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/domains/install.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/install.handlers.ts @@ -1,12 +1,12 @@ import { rest } from 'msw'; -import umbracoPath from '../../core/helpers/umbraco-path'; +import { umbracoPath } from '@umbraco-cms/utils'; import type { PostInstallRequest, ProblemDetails, UmbracoInstaller, UmbracoPerformInstallDatabaseConfiguration, -} from '../../core/models'; +} from '@umbraco-cms/models'; export const handlers = [ rest.get(umbracoPath('/install/settings'), (_req, res, ctx) => { diff --git a/src/Umbraco.Web.UI.Client/src/mocks/domains/manifests.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/manifests.handlers.ts similarity index 87% rename from src/Umbraco.Web.UI.Client/src/mocks/domains/manifests.handlers.ts rename to src/Umbraco.Web.UI.Client/src/core/mocks/domains/manifests.handlers.ts index 53025cb2a3..315e23fa22 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/domains/manifests.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/manifests.handlers.ts @@ -1,8 +1,8 @@ import { rest } from 'msw'; -import umbracoPath from '../../core/helpers/umbraco-path'; +import { umbracoPath } from '@umbraco-cms/utils'; -import type { ManifestsPackagesInstalledResponse, ManifestsResponse } from '../../core/models'; +import type { ManifestsPackagesInstalledResponse, ManifestsResponse } from '@umbraco-cms/models'; export const manifestDevelopmentHandler = rest.get(umbracoPath('/manifests'), (_req, res, ctx) => { return res( @@ -14,7 +14,7 @@ export const manifestDevelopmentHandler = rest.get(umbracoPath('/manifests'), (_ type: 'section', alias: 'My.Section.Custom', name: 'Custom Section', - js: '/src/mocks/App_Plugins/section.js', + js: '/App_Plugins/section.js', elementName: 'my-section-custom', weight: 1, meta: { @@ -26,7 +26,7 @@ export const manifestDevelopmentHandler = rest.get(umbracoPath('/manifests'), (_ type: 'propertyEditorUI', alias: 'My.PropertyEditorUI.Custom', name: 'My Custom Property Editor UI', - js: '/src/mocks/App_Plugins/property-editor.js', + js: '/App_Plugins/property-editor.js', elementName: 'my-property-editor-ui-custom', meta: { label: 'My Custom Property', @@ -39,13 +39,13 @@ export const manifestDevelopmentHandler = rest.get(umbracoPath('/manifests'), (_ type: 'entrypoint', name: 'My Custom Entry Point', alias: 'My.Entrypoint.Custom', - js: '/src/mocks/App_Plugins/custom-entrypoint.js', + js: '/App_Plugins/custom-entrypoint.js', }, { type: 'packageView', alias: 'My.PackageView.Custom', name: 'My Custom Package View', - js: '/src/mocks/App_Plugins/package-view.js', + js: '/App_Plugins/package-view.js', meta: { packageAlias: 'my.package', }, diff --git a/src/Umbraco.Web.UI.Client/src/mocks/domains/node.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/node.handlers.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/mocks/domains/node.handlers.ts rename to src/Umbraco.Web.UI.Client/src/core/mocks/domains/node.handlers.ts diff --git a/src/Umbraco.Web.UI.Client/src/mocks/domains/property-editor.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/property-editor.handlers.ts similarity index 93% rename from src/Umbraco.Web.UI.Client/src/mocks/domains/property-editor.handlers.ts rename to src/Umbraco.Web.UI.Client/src/core/mocks/domains/property-editor.handlers.ts index b7410401f0..4800c98cea 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/domains/property-editor.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/property-editor.handlers.ts @@ -1,12 +1,11 @@ import { rest } from 'msw'; -import umbracoPath from '../../core/helpers/umbraco-path'; +import { umbPropertyEditorData } from '../data/property-editor.data'; +import { umbracoPath } from '@umbraco-cms/utils'; import type { PropertyEditorsListResponse, PropertyEditorResponse, PropertyEditorConfigResponse, -} from '../../core/models'; - -import { umbPropertyEditorData } from '../data/property-editor.data'; +} from '@umbraco-cms/models'; // TODO: add schema export const handlers = [ diff --git a/src/Umbraco.Web.UI.Client/src/mocks/domains/published-status.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/published-status.handlers.ts similarity index 94% rename from src/Umbraco.Web.UI.Client/src/mocks/domains/published-status.handlers.ts rename to src/Umbraco.Web.UI.Client/src/core/mocks/domains/published-status.handlers.ts index 63c9207ddc..be2e96acd4 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/domains/published-status.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/published-status.handlers.ts @@ -1,6 +1,6 @@ import { rest } from 'msw'; -import umbracoPath from '../../core/helpers/umbraco-path'; +import { umbracoPath } from '@umbraco-cms/utils'; export const handlers = [ rest.get(umbracoPath('/published-cache/status'), (_req, res, ctx) => { diff --git a/src/Umbraco.Web.UI.Client/src/mocks/domains/server.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/server.handlers.ts similarity index 88% rename from src/Umbraco.Web.UI.Client/src/mocks/domains/server.handlers.ts rename to src/Umbraco.Web.UI.Client/src/core/mocks/domains/server.handlers.ts index 417a8b8706..3d76a01177 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/domains/server.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/server.handlers.ts @@ -1,7 +1,7 @@ import { rest } from 'msw'; -import umbracoPath from '../../core/helpers/umbraco-path'; -import type { StatusResponse, VersionResponse } from '../../core/models'; +import { umbracoPath } from '@umbraco-cms/utils'; +import type { StatusResponse, VersionResponse } from '@umbraco-cms/models'; export const serverRunningHandler = rest.get(umbracoPath('/server/status'), (_req, res, ctx) => { return res( diff --git a/src/Umbraco.Web.UI.Client/src/mocks/domains/telemetry.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/telemetry.handlers.ts similarity index 85% rename from src/Umbraco.Web.UI.Client/src/mocks/domains/telemetry.handlers.ts rename to src/Umbraco.Web.UI.Client/src/core/mocks/domains/telemetry.handlers.ts index 84555c27a7..d6ea8551b7 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/domains/telemetry.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/telemetry.handlers.ts @@ -1,7 +1,7 @@ import { rest } from 'msw'; -import umbracoPath from '../../core/helpers/umbraco-path'; -import type { ConsentLevelSettings, TelemetryModel } from '../../core/models'; +import { umbracoPath } from '@umbraco-cms/utils'; +import type { ConsentLevelSettings, TelemetryModel } from '@umbraco-cms/models'; let telemetryLevel: TelemetryModel['level'] = 'Basic'; diff --git a/src/Umbraco.Web.UI.Client/src/mocks/domains/upgrade.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/upgrade.handlers.ts similarity index 83% rename from src/Umbraco.Web.UI.Client/src/mocks/domains/upgrade.handlers.ts rename to src/Umbraco.Web.UI.Client/src/core/mocks/domains/upgrade.handlers.ts index 6b00f51461..99a20642a9 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/domains/upgrade.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/upgrade.handlers.ts @@ -1,7 +1,7 @@ import { rest } from 'msw'; -import umbracoPath from '../../core/helpers/umbraco-path'; -import type { PostInstallRequest, UmbracoUpgrader } from '../../core/models'; +import { umbracoPath } from '@umbraco-cms/utils'; +import type { PostInstallRequest, UmbracoUpgrader } from '@umbraco-cms/models'; export const handlers = [ rest.get(umbracoPath('/upgrade/settings'), (_req, res, ctx) => { diff --git a/src/Umbraco.Web.UI.Client/src/mocks/domains/user-groups.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/user-groups.handlers.ts similarity index 95% rename from src/Umbraco.Web.UI.Client/src/mocks/domains/user-groups.handlers.ts rename to src/Umbraco.Web.UI.Client/src/core/mocks/domains/user-groups.handlers.ts index 6d596a8a1e..072b22a765 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/domains/user-groups.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/user-groups.handlers.ts @@ -1,5 +1,5 @@ import { rest } from 'msw'; -import type { UserGroupDetails } from '../../core/models'; +import type { UserGroupDetails } from '@umbraco-cms/models'; export const handlers = [ rest.get('/umbraco/backoffice/user-groups/list/items', (req, res, ctx) => { diff --git a/src/Umbraco.Web.UI.Client/src/mocks/domains/user.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/user.handlers.ts similarity index 90% rename from src/Umbraco.Web.UI.Client/src/mocks/domains/user.handlers.ts rename to src/Umbraco.Web.UI.Client/src/core/mocks/domains/user.handlers.ts index 4d31e91e55..a460867d24 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/domains/user.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/user.handlers.ts @@ -1,7 +1,7 @@ import { rest } from 'msw'; -import umbracoPath from '../../core/helpers/umbraco-path'; -import type { AllowedSectionsResponse, UserResponse } from '../../core/models'; +import { umbracoPath } from '@umbraco-cms/utils'; +import type { AllowedSectionsResponse, UserResponse } from '@umbraco-cms/models'; let isAuthenticated = false; diff --git a/src/Umbraco.Web.UI.Client/src/mocks/domains/users.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/users.handlers.ts similarity index 97% rename from src/Umbraco.Web.UI.Client/src/mocks/domains/users.handlers.ts rename to src/Umbraco.Web.UI.Client/src/core/mocks/domains/users.handlers.ts index c348e312b0..4e5ce1b4d4 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/domains/users.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/users.handlers.ts @@ -1,7 +1,7 @@ import { rest } from 'msw'; import { v4 as uuidv4 } from 'uuid'; -import type { UserDetails } from '../../core/models'; import { umbUsersData } from '../data/users.data'; +import type { UserDetails } from '@umbraco-cms/models'; // TODO: add schema export const handlers = [ diff --git a/src/Umbraco.Web.UI.Client/src/mocks/e2e-handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/e2e-handlers.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/mocks/e2e-handlers.ts rename to src/Umbraco.Web.UI.Client/src/core/mocks/e2e-handlers.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/models/index.ts b/src/Umbraco.Web.UI.Client/src/core/models/index.ts index 4ba781d242..8c1134e985 100644 --- a/src/Umbraco.Web.UI.Client/src/core/models/index.ts +++ b/src/Umbraco.Web.UI.Client/src/core/models/index.ts @@ -1,6 +1,6 @@ import type { components } from '../../../schemas/generated-schema'; import type { UserStatus } from '../../backoffice/sections/users/user-extensions'; -import { Entity } from '../../mocks/data/entities'; +import { Entity } from '../mocks/data/entities'; export type PostInstallRequest = components['schemas']['InstallSetupRequest']; export type StatusResponse = components['schemas']['StatusResponse']; diff --git a/src/Umbraco.Web.UI.Client/src/core/observer/index.ts b/src/Umbraco.Web.UI.Client/src/core/observable-api/index.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/observer/index.ts rename to src/Umbraco.Web.UI.Client/src/core/observable-api/index.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/observer/observer.mixin.ts b/src/Umbraco.Web.UI.Client/src/core/observable-api/observer.mixin.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/observer/observer.mixin.ts rename to src/Umbraco.Web.UI.Client/src/core/observable-api/observer.mixin.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/property-editor-ui-picker/modal-layout-property-editor-ui-picker.element.ts b/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/property-editor-ui-picker/modal-layout-property-editor-ui-picker.element.ts index 8860e85fc1..a946384f6d 100644 --- a/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/property-editor-ui-picker/modal-layout-property-editor-ui-picker.element.ts +++ b/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/property-editor-ui-picker/modal-layout-property-editor-ui-picker.element.ts @@ -4,12 +4,12 @@ import { customElement, property, state } from 'lit/decorators.js'; import { repeat } from 'lit/directives/repeat.js'; import { groupBy } from 'lodash'; import type { UUIInputEvent } from '@umbraco-ui/uui'; -import { UmbContextConsumerMixin } from '../../../../context'; - import type { UmbModalHandler } from '../../modal-handler'; -import type { UmbExtensionRegistry } from '../../../../extension'; -import type { ManifestPropertyEditorUI } from '../../../../models'; -import { UmbObserverMixin } from '../../../../observer'; +import { UmbObserverMixin } from '@umbraco-cms/observable-api'; +import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; + +import type { UmbExtensionRegistry } from '@umbraco-cms/extensions-api'; +import type { ManifestPropertyEditorUI } from '@umbraco-cms/models'; export interface UmbModalPropertyEditorUIPickerData { selection?: Array; diff --git a/src/Umbraco.Web.UI.Client/src/core/services/modal/modal.stories.mdx b/src/Umbraco.Web.UI.Client/src/core/services/modal/modal.stories.mdx index 4d693172b9..91b54b1883 100644 --- a/src/Umbraco.Web.UI.Client/src/core/services/modal/modal.stories.mdx +++ b/src/Umbraco.Web.UI.Client/src/core/services/modal/modal.stories.mdx @@ -24,7 +24,7 @@ The UmbModal service can be used to open modals. ```ts import { html, LitElement } from 'lit'; -import { UmbContextConsumerMixin } from './core/context'; +import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; import type { UmbModalService } from './core/services/modal'; class MyElement extends UmbContextConsumerMixin(LitElement) { 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 { UmbContextConsumerMixin } from './core/context'; +import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; import type { UmbModalService } from './core/services/modal'; class MyElement extends UmbContextConsumerMixin(LitElement) { private _modalService?: UmbModalService; diff --git a/src/Umbraco.Web.UI.Client/src/core/services/modal/modal.stories.ts b/src/Umbraco.Web.UI.Client/src/core/services/modal/modal.stories.ts index a675f9494f..6a9e6bbc29 100644 --- a/src/Umbraco.Web.UI.Client/src/core/services/modal/modal.stories.ts +++ b/src/Umbraco.Web.UI.Client/src/core/services/modal/modal.stories.ts @@ -3,8 +3,8 @@ import { LitElement } from 'lit'; import { html } from 'lit-html'; import { customElement, property, state } from 'lit/decorators.js'; -import { UmbContextConsumerMixin } from '../../context'; import { UmbModalService } from './'; +import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; export default { title: 'API/Modals', diff --git a/src/Umbraco.Web.UI.Client/src/core/services/notification/notification.stories.mdx b/src/Umbraco.Web.UI.Client/src/core/services/notification/notification.stories.mdx index 557ef857c3..9556c3e4bc 100644 --- a/src/Umbraco.Web.UI.Client/src/core/services/notification/notification.stories.mdx +++ b/src/Umbraco.Web.UI.Client/src/core/services/notification/notification.stories.mdx @@ -4,7 +4,7 @@ import { Meta } from '@storybook/addon-docs'; # Notifications -Notifications appear in the bottom right corner of the Backoffice. There are two types of notifications: "Peek" and "Stay". +Notifications appear in the bottom right corner of the Backoffice. There are two types of notifications: "Peek" and "Stay". **Peek notifications** Goes away automatically and should be used as feedback on user actions. @@ -20,21 +20,20 @@ The UmbNotification service can be used to open notifications. ```ts import { html, LitElement } from 'lit'; -import { UmbContextConsumerMixin } from './core/context'; +import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; import type { UmbNotificationService } from './core/services/notification'; class MyElement extends UmbContextConsumerMixin(LitElement) { + private _notificationService?: UmbNotificationService; - private _notificationService?: UmbNotificationService; + constructor() { + super(); - constructor () { - super(); - - this.consumeContext('umbNotificationService', (notificationService) => { - this._notificationService = notificationService; - // notificationService is now ready to be used - }); - } + this.consumeContext('umbNotificationService', (notificationService) => { + this._notificationService = notificationService; + // notificationService is now ready to be used + }); + } } ``` @@ -45,34 +44,33 @@ 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 { UmbContextConsumerMixin } from './core/context'; +import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; import type { UmbNotificationService, UmbNotificationDefaultData } from './core/services/notification'; class MyElement extends UmbContextConsumerMixin(LitElement) { + private _notificationService?: UmbNotificationService; - private _notificationService?: UmbNotificationService; + constructor() { + super(); - constructor () { - super(); + this.consumeContext('umbNotificationService', (notificationService) => { + this._notificationService = notificationService; + // notificationService is now ready to be used + }); + } - this.consumeContext('umbNotificationService', (notificationService) => { - this._notificationService = notificationService; - // notificationService is now ready to be used - }); - } + private _handleClick() { + const data: UmbNotificationDefaultData = { headline: 'Look at this', message: 'Something good happened' }; + const notificationHandler = this._notificationService?.peek('positive', { data }); - private _handleClick () { - const data: UmbNotificationDefaultData = { headline: 'Look at this', message: 'Something good happened' }; - const notificationHandler = this._notificationService?.peek('positive', { data }); + notificationHandler.onClose().then(() => { + // if you need any logic when the notification is closed you can run it here + }); + } - notificationHandler.onClose().then(() => { - // if you need any logic when the notification is closed you can run it here - }); - } - - render() { - return html``; - } + render() { + return html``; + } } ``` @@ -89,35 +87,33 @@ import { UUITextStyles } from '@umbraco-ui/uui-css'; import type { UmbNotificationHandler } from './core/services/notification'; export interface UmbNotificationCustomData { - headline: string; - user: { - name: string; - } + headline: string; + user: { + name: string; + }; } export class UmbNotificationLayoutCustom extends LitElement { - static styles = [ - UUITextStyles - ]; + static styles = [UUITextStyles]; - @property({ attribute: false }) - public notificationHandler: UmbNotificationHandler; + @property({ attribute: false }) + public notificationHandler: UmbNotificationHandler; - @property({ type: Object }) - public data: UmbNotificationCustomData; + @property({ type: Object }) + public data: UmbNotificationCustomData; - private _handleConfirm () { - this.notificationHandler.close(true); - } + private _handleConfirm() { + this.notificationHandler.close(true); + } - render() { - return html` - - ${this.data.user.name} - Confirm - - `; - } + render() { + return html` + + ${this.data.user.name} + Confirm + + `; + } } ``` @@ -125,49 +121,49 @@ export class UmbNotificationLayoutCustom extends LitElement { ```ts import { html, LitElement } from 'lit'; -import { UmbContextInjectMixin } from './core/context'; +import { UmbContextInjectMixin } from '@umbraco-cms/context-api'; import type { UmbNotificationService, UmbNotificationOptions } from './core/services/notification'; import type { UmbNotificationCustomData } from './custom-notification-layout'; class MyElement extends LitElement { + private _notificationService?: UmbNotificationService; - private _notificationService?: UmbNotificationService; + constructor() { + super(); - constructor () { - super(); + this.consumeContext('umbNotificationService', (notificationService) => { + this._notificationService = notificationService; + // notificationService is now ready to be used + }); + } - this.consumeContext('umbNotificationService', (notificationService) => { - this._notificationService = notificationService; - // notificationService is now ready to be used - }); - } + private _handleClick() { + const options: UmbNotificationOptions = { + elementName: 'umb-notification-layout-custom', + data: { + headline: 'Attention', + user: { name: 'Peter Parker' }, + }, + }; - private _handleClick () { - const options: UmbNotificationOptions = { - elementName: 'umb-notification-layout-custom', - data: { - headline: 'Attention', - user: { name: 'Peter Parker' } - } - }; + const notificationHandler = this._notificationService?.stay('default', options); - const notificationHandler = this._notificationService?.stay('default', options); + notificationHandler.onClose().then((result) => { + if (result) { + console.log('He agreed!'); + } + }); + } - notificationHandler.onClose().then((result) => { - if (result) { - console.log('He agreed!'); - } - }); - } - - render() { - return html``; - } + render() { + return html``; + } } ``` ## Best practices -* Keep messages in notifications short and friendly. -* Only use headlines when you need extra attention to the notification -* If a custom notification layout is only used in one module keep the files layout files local to that module. -* If a custom notification will be used across the project. Create it as a layout in the notification folder and add a helper method to the UmbNotificationService. + +- Keep messages in notifications short and friendly. +- Only use headlines when you need extra attention to the notification +- If a custom notification layout is only used in one module keep the files layout files local to that module. +- If a custom notification will be used across the project. Create it as a layout in the notification folder and add a helper method to the UmbNotificationService. diff --git a/src/Umbraco.Web.UI.Client/src/core/services/notification/notification.stories.ts b/src/Umbraco.Web.UI.Client/src/core/services/notification/notification.stories.ts index 23776d3167..4dd11ecacb 100644 --- a/src/Umbraco.Web.UI.Client/src/core/services/notification/notification.stories.ts +++ b/src/Umbraco.Web.UI.Client/src/core/services/notification/notification.stories.ts @@ -1,12 +1,12 @@ import '../../../backoffice/components/backoffice-notification-container.element'; -import '../../context/provide/context-provider.element'; +import '../../context-api/provide/context-provider.element'; import './layouts/default'; import { Meta, Story } from '@storybook/web-components'; import { html, LitElement } from 'lit'; import { customElement } from 'lit/decorators.js'; -import { UmbContextConsumerMixin } from '../../context'; +import { UmbContextConsumerMixin } from '../../context-api'; import type { UmbNotificationDefaultData } from './layouts/default'; import { UmbNotificationColor, UmbNotificationOptions, UmbNotificationService } from '.'; diff --git a/src/Umbraco.Web.UI.Client/src/core/stores/data-type/data-type.store.ts b/src/Umbraco.Web.UI.Client/src/core/stores/data-type/data-type.store.ts index 1ac1167214..9c57c8b7f0 100644 --- a/src/Umbraco.Web.UI.Client/src/core/stores/data-type/data-type.store.ts +++ b/src/Umbraco.Web.UI.Client/src/core/stores/data-type/data-type.store.ts @@ -1,5 +1,5 @@ import { map, Observable } from 'rxjs'; -import { DataTypeDetails } from '../../../mocks/data/data-type.data'; +import { DataTypeDetails } from '../../mocks/data/data-type.data'; import { UmbEntityStore } from '../entity.store'; import { UmbDataStoreBase } from '../store'; diff --git a/src/Umbraco.Web.UI.Client/src/core/stores/document-type.store.ts b/src/Umbraco.Web.UI.Client/src/core/stores/document-type.store.ts index d93eeb484c..a51d5a3678 100644 --- a/src/Umbraco.Web.UI.Client/src/core/stores/document-type.store.ts +++ b/src/Umbraco.Web.UI.Client/src/core/stores/document-type.store.ts @@ -1,5 +1,5 @@ import { map, Observable } from 'rxjs'; -import { DocumentTypeEntity } from '../../mocks/data/document-type.data'; +import { DocumentTypeEntity } from '../mocks/data/document-type.data'; import { UmbEntityStore } from './entity.store'; import { UmbDataStoreBase } from './store'; diff --git a/src/Umbraco.Web.UI.Client/src/core/stores/entity.store.ts b/src/Umbraco.Web.UI.Client/src/core/stores/entity.store.ts index fbf44d2c4a..6605e34fdd 100644 --- a/src/Umbraco.Web.UI.Client/src/core/stores/entity.store.ts +++ b/src/Umbraco.Web.UI.Client/src/core/stores/entity.store.ts @@ -1,5 +1,5 @@ import { Observable, map } from 'rxjs'; -import type { Entity } from '../../mocks/data/entities'; +import type { Entity } from '../mocks/data/entities'; import { UmbDataStoreBase } from './store'; export class UmbEntityStore extends UmbDataStoreBase { diff --git a/src/Umbraco.Web.UI.Client/src/core/stores/node.store.ts b/src/Umbraco.Web.UI.Client/src/core/stores/node.store.ts index 4f2d263a49..1509c6c6c2 100644 --- a/src/Umbraco.Web.UI.Client/src/core/stores/node.store.ts +++ b/src/Umbraco.Web.UI.Client/src/core/stores/node.store.ts @@ -1,5 +1,5 @@ import { map, Observable } from 'rxjs'; -import { NodeEntity } from '../../mocks/data/node.data'; +import { NodeEntity } from '../mocks/data/node.data'; import { UmbEntityStore } from './entity.store'; import { UmbDataStoreBase } from './store'; diff --git a/src/Umbraco.Web.UI.Client/src/core/stores/property-editor-config/property-editor-config.store.ts b/src/Umbraco.Web.UI.Client/src/core/stores/property-editor-config/property-editor-config.store.ts index 5556369b3b..f3b47fa2c7 100644 --- a/src/Umbraco.Web.UI.Client/src/core/stores/property-editor-config/property-editor-config.store.ts +++ b/src/Umbraco.Web.UI.Client/src/core/stores/property-editor-config/property-editor-config.store.ts @@ -1,5 +1,5 @@ import { map, Observable } from 'rxjs'; -import { getPropertyEditorConfig } from '../../api/fetcher'; +import { getPropertyEditorConfig } from '../../backend-api/fetcher'; import type { PropertyEditorConfig } from '../../models'; import { UmbDataStoreBase } from '../store'; diff --git a/src/Umbraco.Web.UI.Client/src/core/stores/property-editor/property-editor.store.ts b/src/Umbraco.Web.UI.Client/src/core/stores/property-editor/property-editor.store.ts index 678ff1f3f3..13b4c83120 100644 --- a/src/Umbraco.Web.UI.Client/src/core/stores/property-editor/property-editor.store.ts +++ b/src/Umbraco.Web.UI.Client/src/core/stores/property-editor/property-editor.store.ts @@ -1,6 +1,6 @@ import { map, Observable } from 'rxjs'; import type { PropertyEditor } from '../../models'; -import { getPropertyEditorsList, getPropertyEditor } from '../../api/fetcher'; +import { getPropertyEditorsList, getPropertyEditor } from '../../backend-api/fetcher'; import { UmbDataStoreBase } from '../store'; /** diff --git a/src/Umbraco.Web.UI.Client/src/core/stores/section.store.ts b/src/Umbraco.Web.UI.Client/src/core/stores/section.store.ts index 034cb4c686..64eabfca98 100644 --- a/src/Umbraco.Web.UI.Client/src/core/stores/section.store.ts +++ b/src/Umbraco.Web.UI.Client/src/core/stores/section.store.ts @@ -1,5 +1,5 @@ -import { map, Observable, ReplaySubject } from 'rxjs'; -import { UmbExtensionRegistry } from '../extension'; +import { Observable, ReplaySubject } from 'rxjs'; +import { UmbExtensionRegistry } from '@umbraco-cms/extensions-api'; // TODO: maybe this should be named something else than store? export class UmbSectionStore { diff --git a/src/Umbraco.Web.UI.Client/src/core/helpers/chai.ts b/src/Umbraco.Web.UI.Client/src/core/test-utils/chai.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/helpers/chai.ts rename to src/Umbraco.Web.UI.Client/src/core/test-utils/chai.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/test-utils/index.ts b/src/Umbraco.Web.UI.Client/src/core/test-utils/index.ts new file mode 100644 index 0000000000..0d2296cc1c --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/core/test-utils/index.ts @@ -0,0 +1 @@ +export * from './chai'; diff --git a/src/Umbraco.Web.UI.Client/src/core/utils/index.ts b/src/Umbraco.Web.UI.Client/src/core/utils/index.ts new file mode 100644 index 0000000000..5a35efec4f --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/core/utils/index.ts @@ -0,0 +1 @@ +export * from './umbraco-path'; diff --git a/src/Umbraco.Web.UI.Client/src/core/helpers/umbraco-path.ts b/src/Umbraco.Web.UI.Client/src/core/utils/umbraco-path.ts similarity index 68% rename from src/Umbraco.Web.UI.Client/src/core/helpers/umbraco-path.ts rename to src/Umbraco.Web.UI.Client/src/core/utils/umbraco-path.ts index f77f30c645..73c1c1cd15 100644 --- a/src/Umbraco.Web.UI.Client/src/core/helpers/umbraco-path.ts +++ b/src/Umbraco.Web.UI.Client/src/core/utils/umbraco-path.ts @@ -2,6 +2,6 @@ import { Path } from 'msw'; import type { paths } from '../../../schemas/generated-schema'; -export default function umbracoPath(path: keyof paths): Path { +export function umbracoPath(path: keyof paths): Path { return `/umbraco/backoffice${path}`; } diff --git a/src/Umbraco.Web.UI.Client/src/css/custom-properties.css b/src/Umbraco.Web.UI.Client/src/css/custom-properties.css deleted file mode 100644 index ef8aea5369..0000000000 --- a/src/Umbraco.Web.UI.Client/src/css/custom-properties.css +++ /dev/null @@ -1,5 +0,0 @@ -@import '../../node_modules/@umbraco-ui/uui-css/dist/uui-css.css'; - -:root { - --uui-color-positive: #1c874c; -} diff --git a/src/Umbraco.Web.UI.Client/src/index.ts b/src/Umbraco.Web.UI.Client/src/index.ts index 02462f443b..2e5dad9fa4 100644 --- a/src/Umbraco.Web.UI.Client/src/index.ts +++ b/src/Umbraco.Web.UI.Client/src/index.ts @@ -1,6 +1,6 @@ import 'element-internals-polyfill'; -import { startMockServiceWorker } from './mocks/browser'; +import { startMockServiceWorker } from './core/mocks/browser'; if (import.meta.env.VITE_UMBRACO_USE_MSW === 'on') { startMockServiceWorker(); 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 d5632e7b09..c5074617b6 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 @@ -1,11 +1,10 @@ import { css, CSSResultGroup, html, LitElement } from 'lit'; import { customElement, state } from 'lit/decorators.js'; import { unsafeHTML } from 'lit/directives/unsafe-html.js'; - -import { UmbContextConsumerMixin } from '../../core/context'; -import type { PostInstallRequest, TelemetryModel, UmbracoInstaller } from '../../core/models'; -import { UmbObserverMixin } from '../../core/observer'; import { UmbInstallerContext } from '../installer.context'; +import { UmbObserverMixin } from '@umbraco-cms/observable-api'; +import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; +import type { PostInstallRequest, TelemetryModel, UmbracoInstaller } from '@umbraco-cms/models'; @customElement('umb-installer-consent') export class UmbInstallerConsentElement extends UmbContextConsumerMixin(UmbObserverMixin(LitElement)) { diff --git a/src/Umbraco.Web.UI.Client/src/installer/consent/installer-content.test.ts b/src/Umbraco.Web.UI.Client/src/installer/consent/installer-content.test.ts index 3437342736..4dd22ce571 100644 --- a/src/Umbraco.Web.UI.Client/src/installer/consent/installer-content.test.ts +++ b/src/Umbraco.Web.UI.Client/src/installer/consent/installer-content.test.ts @@ -1,7 +1,7 @@ import { expect, fixture, html } from '@open-wc/testing'; -import { defaultA11yConfig } from '../../core/helpers/chai'; import { UmbInstallerConsentElement } from './installer-consent.element'; +import { defaultA11yConfig } from '@umbraco-cms/test-utils'; // TODO: Write tests describe('UmbInstallerConsentElement', () => { 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 1761455876..731d6fe338 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 @@ -1,17 +1,16 @@ import { UUIButtonElement } from '@umbraco-ui/uui'; import { css, CSSResultGroup, html, LitElement, nothing } from 'lit'; import { customElement, property, query, state } from 'lit/decorators.js'; - -import { postInstallSetup, postInstallValidateDatabase } from '../../core/api/fetcher'; -import { UmbContextConsumerMixin } from '../../core/context'; +import { UmbInstallerContext } from '../installer.context'; +import { UmbObserverMixin } from '@umbraco-cms/observable-api'; +import { postInstallSetup, postInstallValidateDatabase } from '@umbraco-cms/backend-api'; +import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; import type { PostInstallRequest, UmbracoInstaller, UmbracoInstallerDatabaseModel, UmbracoPerformInstallDatabaseConfiguration, -} from '../../core/models'; -import { UmbObserverMixin } from '../../core/observer'; -import { UmbInstallerContext } from '../installer.context'; +} from '@umbraco-cms/models'; @customElement('umb-installer-database') export class UmbInstallerDatabaseElement extends UmbContextConsumerMixin(UmbObserverMixin(LitElement)) { diff --git a/src/Umbraco.Web.UI.Client/src/installer/database/installer-database.stories.ts b/src/Umbraco.Web.UI.Client/src/installer/database/installer-database.stories.ts index c55e5c392b..cb4c56a773 100644 --- a/src/Umbraco.Web.UI.Client/src/installer/database/installer-database.stories.ts +++ b/src/Umbraco.Web.UI.Client/src/installer/database/installer-database.stories.ts @@ -2,9 +2,9 @@ import { Meta, Story } from '@storybook/web-components'; import { html } from 'lit-html'; import { rest } from 'msw'; -import type { UmbracoInstaller } from '../../core/models'; import { installerContextProvider } from '../shared/utils.story-helpers'; import type { UmbInstallerDatabaseElement } from './installer-database.element'; +import type { UmbracoInstaller } from '@umbraco-cms/models'; import './installer-database.element'; export default { diff --git a/src/Umbraco.Web.UI.Client/src/installer/database/installer-database.test.ts b/src/Umbraco.Web.UI.Client/src/installer/database/installer-database.test.ts index 9c6b7afadb..772e6ba8cb 100644 --- a/src/Umbraco.Web.UI.Client/src/installer/database/installer-database.test.ts +++ b/src/Umbraco.Web.UI.Client/src/installer/database/installer-database.test.ts @@ -1,7 +1,7 @@ import { expect, fixture, html } from '@open-wc/testing'; -import { defaultA11yConfig } from '../../core/helpers/chai'; import { UmbInstallerDatabaseElement } from './installer-database.element'; +import { defaultA11yConfig } from '@umbraco-cms/test-utils'; // TODO: Write tests describe('UmbInstallerDatabaseElement', () => { 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 aa4267722e..3f820143a7 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 @@ -1,10 +1,9 @@ import { css, CSSResultGroup, html, LitElement, nothing } from 'lit'; import { customElement, state } from 'lit/decorators.js'; -import { UmbContextConsumerMixin } from '../../core/context'; - -import type { ProblemDetails } from '../../core/models'; -import { UmbObserverMixin } from '../../core/observer'; import { UmbInstallerContext } from '../installer.context'; +import { UmbObserverMixin } from '@umbraco-cms/observable-api'; +import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; +import type { ProblemDetails } from '@umbraco-cms/models'; @customElement('umb-installer-error') export class UmbInstallerErrorElement extends UmbContextConsumerMixin(UmbObserverMixin(LitElement)) { diff --git a/src/Umbraco.Web.UI.Client/src/installer/error/installer-error.test.ts b/src/Umbraco.Web.UI.Client/src/installer/error/installer-error.test.ts index c5972e33fb..03d2e8ea2c 100644 --- a/src/Umbraco.Web.UI.Client/src/installer/error/installer-error.test.ts +++ b/src/Umbraco.Web.UI.Client/src/installer/error/installer-error.test.ts @@ -1,7 +1,7 @@ import { expect, fixture, html } from '@open-wc/testing'; -import { defaultA11yConfig } from '../../core/helpers/chai'; import { UmbInstallerErrorElement } from './installer-error.element'; +import { defaultA11yConfig } from '@umbraco-cms/test-utils'; // TODO: Write tests describe('UmbInstallerErrorElement', () => { diff --git a/src/Umbraco.Web.UI.Client/src/installer/installer.context.ts b/src/Umbraco.Web.UI.Client/src/installer/installer.context.ts index 1db94fb17e..ae6b244fa1 100644 --- a/src/Umbraco.Web.UI.Client/src/installer/installer.context.ts +++ b/src/Umbraco.Web.UI.Client/src/installer/installer.context.ts @@ -1,7 +1,7 @@ import { BehaviorSubject, Observable, ReplaySubject } from 'rxjs'; -import { getInstallSettings, postInstallSetup } from '../core/api/fetcher'; -import type { PostInstallRequest, ProblemDetails, UmbracoInstaller } from '../core/models'; +import { getInstallSettings, postInstallSetup } from '@umbraco-cms/backend-api'; +import type { PostInstallRequest, ProblemDetails, UmbracoInstaller } from '@umbraco-cms/models'; /** * Context API for the installer 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 93a05236fd..66e04f97bf 100644 --- a/src/Umbraco.Web.UI.Client/src/installer/installer.element.ts +++ b/src/Umbraco.Web.UI.Client/src/installer/installer.element.ts @@ -1,8 +1,8 @@ import { css, CSSResultGroup, html, LitElement } from 'lit'; import { customElement, state } from 'lit/decorators.js'; -import { UmbObserverMixin } from '../core/observer'; -import { UmbContextProviderMixin } from '../core/context'; import { UmbInstallerContext } from './installer.context'; +import { UmbObserverMixin } from '@umbraco-cms/observable-api'; +import { UmbContextProviderMixin } from '@umbraco-cms/context-api'; import './consent/installer-consent.element'; import './database/installer-database.element'; diff --git a/src/Umbraco.Web.UI.Client/src/installer/installer.test.ts b/src/Umbraco.Web.UI.Client/src/installer/installer.test.ts index 176f0335b3..8861e53e43 100644 --- a/src/Umbraco.Web.UI.Client/src/installer/installer.test.ts +++ b/src/Umbraco.Web.UI.Client/src/installer/installer.test.ts @@ -1,7 +1,7 @@ import { expect, fixture, html } from '@open-wc/testing'; -import { defaultA11yConfig } from '../core/helpers/chai'; import { UmbInstallerElement } from './installer.element'; +import { defaultA11yConfig } from '@umbraco-cms/test-utils'; // TODO: Write tests describe('UmbInstallerElement', () => { diff --git a/src/Umbraco.Web.UI.Client/src/installer/installing/installer-installing.test.ts b/src/Umbraco.Web.UI.Client/src/installer/installing/installer-installing.test.ts index 20c2322f62..71768902d8 100644 --- a/src/Umbraco.Web.UI.Client/src/installer/installing/installer-installing.test.ts +++ b/src/Umbraco.Web.UI.Client/src/installer/installing/installer-installing.test.ts @@ -1,7 +1,7 @@ import { expect, fixture, html } from '@open-wc/testing'; -import { defaultA11yConfig } from '../../core/helpers/chai'; import { UmbInstallerInstallingElement } from './installer-installing.element'; +import { defaultA11yConfig } from '@umbraco-cms/test-utils'; // TODO: Write tests describe('UmbInstallerInstallingElement', () => { diff --git a/src/Umbraco.Web.UI.Client/src/installer/shared/layout/installer-layout.test.ts b/src/Umbraco.Web.UI.Client/src/installer/shared/layout/installer-layout.test.ts index ebfb6dcdac..44a6f3b268 100644 --- a/src/Umbraco.Web.UI.Client/src/installer/shared/layout/installer-layout.test.ts +++ b/src/Umbraco.Web.UI.Client/src/installer/shared/layout/installer-layout.test.ts @@ -1,7 +1,7 @@ import { expect, fixture, html } from '@open-wc/testing'; -import { defaultA11yConfig } from '../../../core/helpers/chai'; import { UmbInstallerLayoutElement } from './installer-layout.element'; +import { defaultA11yConfig } from '@umbraco-cms/test-utils'; // TODO: Write tests describe('UmbInstallerLayoutElement', () => { diff --git a/src/Umbraco.Web.UI.Client/src/installer/shared/utils.story-helpers.ts b/src/Umbraco.Web.UI.Client/src/installer/shared/utils.story-helpers.ts index 5f0948127d..f3a302684a 100644 --- a/src/Umbraco.Web.UI.Client/src/installer/shared/utils.story-helpers.ts +++ b/src/Umbraco.Web.UI.Client/src/installer/shared/utils.story-helpers.ts @@ -1,6 +1,6 @@ import { html } from 'lit-html'; import { UmbInstallerContext } from '../installer.context'; -import '../../core/context/provide/context-provider.element'; +import '../../core/context-api/provide/context-provider.element'; export const installerContextProvider = (story: any, installerContext = new UmbInstallerContext()) => html` { diff --git a/src/Umbraco.Web.UI.Client/src/temp-internal-manifests/property-editor-ui.ts b/src/Umbraco.Web.UI.Client/src/temp-internal-manifests/property-editor-ui.ts index 43fe6acdb3..3bd6fedc45 100644 --- a/src/Umbraco.Web.UI.Client/src/temp-internal-manifests/property-editor-ui.ts +++ b/src/Umbraco.Web.UI.Client/src/temp-internal-manifests/property-editor-ui.ts @@ -1,4 +1,4 @@ -import type { ManifestTypes } from '../core/models'; +import type { ManifestTypes } from '@umbraco-cms/models'; export const manifests: Array Promise }> = [ { diff --git a/src/Umbraco.Web.UI.Client/src/upgrader/upgrader-view.element.ts b/src/Umbraco.Web.UI.Client/src/upgrader/upgrader-view.element.ts index d51d7d5bd3..c3d3cf1a1d 100644 --- a/src/Umbraco.Web.UI.Client/src/upgrader/upgrader-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/upgrader/upgrader-view.element.ts @@ -2,7 +2,7 @@ import { css, CSSResultGroup, html, LitElement } from 'lit'; import { customElement, property } from 'lit/decorators.js'; import { ifDefined } from 'lit/directives/if-defined.js'; -import type { UmbracoUpgrader } from '../core/models'; +import type { UmbracoUpgrader } from '@umbraco-cms/models'; /** * @element umb-upgrader-view diff --git a/src/Umbraco.Web.UI.Client/src/upgrader/upgrader-view.test.ts b/src/Umbraco.Web.UI.Client/src/upgrader/upgrader-view.test.ts index 6a4794bf2f..1ad362d987 100644 --- a/src/Umbraco.Web.UI.Client/src/upgrader/upgrader-view.test.ts +++ b/src/Umbraco.Web.UI.Client/src/upgrader/upgrader-view.test.ts @@ -1,7 +1,7 @@ import { expect, fixture, html } from '@open-wc/testing'; -import { defaultA11yConfig } from '../core/helpers/chai'; import { UmbUpgraderView } from './upgrader-view.element'; +import { defaultA11yConfig } from '@umbraco-cms/test-utils'; describe('UmbUpgraderView', () => { let element: UmbUpgraderView; 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 f69883a0d3..c55af2226a 100644 --- a/src/Umbraco.Web.UI.Client/src/upgrader/upgrader.element.ts +++ b/src/Umbraco.Web.UI.Client/src/upgrader/upgrader.element.ts @@ -1,12 +1,10 @@ -import '../installer/shared/layout/installer-layout.element'; -import './upgrader-view.element'; - import { html, LitElement } from 'lit'; import { customElement, state } from 'lit/decorators.js'; +import { getUpgradeSettings, PostUpgradeAuthorize } from '@umbraco-cms/backend-api'; +import type { UmbracoUpgrader } from '@umbraco-cms/models'; -import { getUpgradeSettings, PostUpgradeAuthorize } from '../core/api/fetcher'; - -import type { UmbracoUpgrader } from '../core/models'; +import '../installer/shared/layout/installer-layout.element'; +import './upgrader-view.element'; /** * @element umb-upgrader diff --git a/src/Umbraco.Web.UI.Client/test.ts b/src/Umbraco.Web.UI.Client/test.ts index 00680e64cf..7857e05a2d 100644 --- a/src/Umbraco.Web.UI.Client/test.ts +++ b/src/Umbraco.Web.UI.Client/test.ts @@ -1,7 +1,7 @@ import { expect, test as base } from '@playwright/test'; import { createWorkerFixture } from 'playwright-msw'; -import { handlers } from './src/mocks/e2e-handlers'; +import { handlers } from './src/core/mocks/e2e-handlers'; import type { MockServiceWorker } from 'playwright-msw'; diff --git a/src/Umbraco.Web.UI.Client/tsconfig.json b/src/Umbraco.Web.UI.Client/tsconfig.json index 2c10fdef3e..db849d78f4 100644 --- a/src/Umbraco.Web.UI.Client/tsconfig.json +++ b/src/Umbraco.Web.UI.Client/tsconfig.json @@ -21,7 +21,17 @@ "forceConsistentCasingInFileNames": true, "useDefineForClassFields": false, "skipLibCheck": true, - "resolveJsonModule": true + "resolveJsonModule": true, + "baseUrl": ".", + "paths": { + "@umbraco-cms/models": ["src/core/models"], + "@umbraco-cms/backend-api": ["src/core/backend-api"], + "@umbraco-cms/context-api": ["src/core/context-api"], + "@umbraco-cms/extensions-api": ["src/core/extensions-api"], + "@umbraco-cms/observable-api": ["src/core/observable-api"], + "@umbraco-cms/utils": ["src/core/utils"], + "@umbraco-cms/test-utils": ["src/core/test-utils"] + }, }, "include": [ "src/**/*.ts", diff --git a/src/Umbraco.Web.UI.Client/vite.config.ts b/src/Umbraco.Web.UI.Client/vite.config.ts index 5541e0712e..a9a8182fc9 100644 --- a/src/Umbraco.Web.UI.Client/vite.config.ts +++ b/src/Umbraco.Web.UI.Client/vite.config.ts @@ -1,5 +1,6 @@ import { defineConfig } from 'vite'; import { viteStaticCopy } from 'vite-plugin-static-copy'; +import viteTSConfigPaths from 'vite-tsconfig-paths'; // https://vitejs.dev/config/ export default defineConfig({ @@ -13,7 +14,12 @@ export default defineConfig({ src: 'public-assets/icons/*.js', dest: 'icons', }, + { + src: 'public-assets/App_Plugins/*.js', + dest: 'App_Plugins', + }, ], }), + viteTSConfigPaths(), ], }); 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 ab18a2910a..9ab51e3df4 100644 --- a/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs +++ b/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs @@ -1,22 +1,40 @@ import { esbuildPlugin } from '@web/dev-server-esbuild'; import { playwrightLauncher } from '@web/test-runner-playwright'; +import { importMapsPlugin } from '@web/dev-server-import-maps'; export default { - nodeResolve: true, - files: 'src/**/*.test.ts', - plugins: [esbuildPlugin({ ts: true, target: 'auto' })], - browsers: [ - playwrightLauncher({ product: 'chromium' }), - playwrightLauncher({ product: 'firefox' }), - playwrightLauncher({ product: 'webkit' }), - ], + nodeResolve: true, + files: 'src/**/*.test.ts', + plugins: [ + esbuildPlugin({ ts: true, target: 'auto' }), + importMapsPlugin({ + inject: { + importMap: { + imports: { + '@umbraco-cms/models': './src/core/models/index.ts', + '@umbraco-cms/backend-api': './src/core/backend-api/index.ts', + '@umbraco-cms/context-api': './src/core/context-api/index.ts', + '@umbraco-cms/extensions-api': './src/core/extensions-api/index.ts', + '@umbraco-cms/observable-api': './src/core/observable-api/index.ts', + '@umbraco-cms/utils': './src/core/utils/index.ts', + '@umbraco-cms/test-utils': './src/core/test-utils/index.ts', + }, + }, + }, + }), + ], + browsers: [ + playwrightLauncher({ product: 'chromium' }), + playwrightLauncher({ product: 'firefox' }), + playwrightLauncher({ product: 'webkit' }), + ], coverageConfig: { reporters: ['lcovonly', 'text-summary'], }, - testRunnerHtml: (testFramework) => - ` + testRunnerHtml: (testFramework) => + ` - +