diff --git a/src/Umbraco.Web.UI.Client/.github/CONTRIBUTING.md b/src/Umbraco.Web.UI.Client/.github/CONTRIBUTING.md index f301c54a71..ec8849123a 100644 --- a/src/Umbraco.Web.UI.Client/.github/CONTRIBUTING.md +++ b/src/Umbraco.Web.UI.Client/.github/CONTRIBUTING.md @@ -72,7 +72,7 @@ To make the first button work, which simply just requests a new status from the ```typescript import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; -import { PublishedCacheResource } from '@umbraco-cms/backoffice/backend-api'; +import { PublishedCacheResource } from '@umbraco-cms/backoffice/external/backend-api'; private _getStatus() { const { data: status } = await tryExecuteAndNotify(this, PublishedCacheResource.getPublishedCacheStatus()); diff --git a/src/Umbraco.Web.UI.Client/.storybook/preview.js b/src/Umbraco.Web.UI.Client/.storybook/preview.js index b1c9a5b608..82e43b8b4a 100644 --- a/src/Umbraco.Web.UI.Client/.storybook/preview.js +++ b/src/Umbraco.Web.UI.Client/.storybook/preview.js @@ -15,7 +15,7 @@ import { UmbDocumentDetailStore } from '../src/packages/documents/documents/repo import { UmbDocumentTreeStore } from '../src/packages/documents/documents/tree/document-tree.store'; import { umbExtensionsRegistry } from '../src/packages/core/extension-registry'; import { UmbIconRegistry } from '../src/shared/icon-registry/icon.registry'; -import { UmbLitElement } from '../src/shared/lit-element'; +import { UmbLitElement } from '../src/packages/core/lit-element'; import { umbLocalizationRegistry } from '../src/packages/core/localization'; import customElementManifests from '../dist-cms/custom-elements.json'; diff --git a/src/Umbraco.Web.UI.Client/.vscode/extensions.json b/src/Umbraco.Web.UI.Client/.vscode/extensions.json index 3e18e13dc4..86a36f9dde 100644 --- a/src/Umbraco.Web.UI.Client/.vscode/extensions.json +++ b/src/Umbraco.Web.UI.Client/.vscode/extensions.json @@ -8,6 +8,7 @@ "esbenp.prettier-vscode", "hbenl.vscode-test-explorer", "vunguyentuan.vscode-css-variables", - "unifiedjs.vscode-mdx" + "unifiedjs.vscode-mdx", + "editorconfig.editorconfig" ] } diff --git a/src/Umbraco.Web.UI.Client/.vscode/lit.code-snippets b/src/Umbraco.Web.UI.Client/.vscode/lit.code-snippets index 65acb2b39c..b8907220b6 100644 --- a/src/Umbraco.Web.UI.Client/.vscode/lit.code-snippets +++ b/src/Umbraco.Web.UI.Client/.vscode/lit.code-snippets @@ -6,7 +6,7 @@ "import { UmbTextStyles } from '@umbraco-ui/backoffice/style';", "import { css, html } from 'lit';", "import { customElement } from 'lit/decorators.js';", - "import { UmbLitElement } from '@umbraco-cms/internal/lit-element';", + "import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';", "", "@customElement('umb-${TM_FILENAME_BASE/(.*)\\..+$/$1/}')", "export class Umb${TM_FILENAME_BASE/(.*)\\..+$/${1:/pascalcase}/}Element extends UmbLitElement {", diff --git a/src/Umbraco.Web.UI.Client/devops/build/copy-to-cms.js b/src/Umbraco.Web.UI.Client/devops/build/copy-to-cms.js index 0345f8c4ba..7c2902296f 100644 --- a/src/Umbraco.Web.UI.Client/devops/build/copy-to-cms.js +++ b/src/Umbraco.Web.UI.Client/devops/build/copy-to-cms.js @@ -5,3 +5,5 @@ const outputDir = '../Umbraco.Cms.StaticAssets/wwwroot/umbraco/backoffice'; rmSync(outputDir, { recursive: true, force: true }); cpSync(srcDir, outputDir, { recursive: true }); + +console.log('--- Copied build output to CMS successfully. ---'); diff --git a/src/Umbraco.Web.UI.Client/devops/eslint/rules/no-direct-api-import.cjs b/src/Umbraco.Web.UI.Client/devops/eslint/rules/no-direct-api-import.cjs index b43660c5cc..efb6e7c4b0 100644 --- a/src/Umbraco.Web.UI.Client/devops/eslint/rules/no-direct-api-import.cjs +++ b/src/Umbraco.Web.UI.Client/devops/eslint/rules/no-direct-api-import.cjs @@ -2,7 +2,7 @@ module.exports = { meta: { docs: { description: - 'Ensures that any API resources from the `@umbraco-cms/backoffice/backend-api` module are not used directly. Instead you should use the `tryExecuteAndNotify` function from the `@umbraco-cms/backoffice/resources` module.', + 'Ensures that any API resources from the `@umbraco-cms/backoffice/external/backend-api` module are not used directly. Instead you should use the `tryExecuteAndNotify` function from the `@umbraco-cms/backoffice/resources` module.', category: 'Best Practices', recommended: true, }, diff --git a/src/Umbraco.Web.UI.Client/devops/importmap/index.js b/src/Umbraco.Web.UI.Client/devops/importmap/index.js new file mode 100644 index 0000000000..94f5f64eee --- /dev/null +++ b/src/Umbraco.Web.UI.Client/devops/importmap/index.js @@ -0,0 +1,26 @@ +import { packageJsonExports, packageJsonName } from '../package/index.js'; + +export const createImportMap = (args) => { + const imports = { + ...args.additionalImports, + }; + + // Iterate over the exports in package.json + for (const [key, value] of Object.entries(packageJsonExports || {})) { + // remove leading ./ + if (value) { + const moduleName = key.replace(/^\.\//, ''); + + // replace ./dist-cms with src and remove /index.js + const modulePath = value.replace(/^\.\/dist-cms/, args.rootDir).replace('.js', '.ts'); + console.log('replacing', value, 'with', modulePath) + const importAlias = `${packageJsonName}/${moduleName}`; + + imports[importAlias] = modulePath; + } + } + + return { + imports, + }; +}; diff --git a/src/Umbraco.Web.UI.Client/devops/package/index.js b/src/Umbraco.Web.UI.Client/devops/package/index.js new file mode 100644 index 0000000000..fc8b67368b --- /dev/null +++ b/src/Umbraco.Web.UI.Client/devops/package/index.js @@ -0,0 +1 @@ +export * from './meta.js'; diff --git a/src/Umbraco.Web.UI.Client/devops/package/meta.js b/src/Umbraco.Web.UI.Client/devops/package/meta.js new file mode 100644 index 0000000000..aab3837cb9 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/devops/package/meta.js @@ -0,0 +1,6 @@ +import { readFileSync } from 'fs'; + +export const packageJsonPath = 'package.json'; +export const packageJsonData = JSON.parse(readFileSync(packageJsonPath).toString()); +export const packageJsonName = packageJsonData.name; +export const packageJsonExports = packageJsonData.exports; diff --git a/src/Umbraco.Web.UI.Client/devops/package/validate-exports.js b/src/Umbraco.Web.UI.Client/devops/package/validate-exports.js new file mode 100644 index 0000000000..0935771ee7 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/devops/package/validate-exports.js @@ -0,0 +1,26 @@ +import { globSync } from 'glob'; +import { packageJsonExports } from './meta.js'; + +const validateExports = async () => { + const errors = []; + + // Iterate over the exports in package.json + for (const [key, value] of Object.entries(packageJsonExports || {})) { + if (value) { + const jsFiles = await globSync(value); + + // Log an error if the export from the package.json does not exist in the build output + if (jsFiles.length === 0) { + errors.push(`Could not find export: ${key} -> ${value} in the build output.`); + } + } + } + + if (errors.length > 0) { + throw new Error(errors.join('\n')); + } else { + console.log('--- Exports validated successfully. ---'); + } +}; + +validateExports(); diff --git a/src/Umbraco.Web.UI.Client/devops/tsconfig/index.js b/src/Umbraco.Web.UI.Client/devops/tsconfig/index.js new file mode 100644 index 0000000000..69ad7badaa --- /dev/null +++ b/src/Umbraco.Web.UI.Client/devops/tsconfig/index.js @@ -0,0 +1,61 @@ +import { writeFileSync } from 'fs'; +import { format } from 'prettier'; +import { createImportMap } from '../importmap/index.js'; + +const tsconfigPath = 'tsconfig.json'; +const tsconfigComment = `// Don't edit this file directly. It is generated by /devops/tsconfig/index.js\n\n`; + +const tsConfigBase = { + compilerOptions: { + module: 'esnext', + target: 'ES2020', + lib: ['es2020', 'dom', 'dom.iterable'], + outDir: './types', + allowSyntheticDefaultImports: true, + experimentalDecorators: true, + forceConsistentCasingInFileNames: true, + useDefineForClassFields: false, + baseUrl: '.', + incremental: true, + skipLibCheck: true, + /* Bundler mode */ + moduleResolution: 'bundler', + allowImportingTsExtensions: true, + resolveJsonModule: true, + isolatedModules: true, + noEmit: true, + /* Linting */ + strict: true, + noFallthroughCasesInSwitch: true, + noImplicitReturns: true, + }, + include: ['src/**/*.ts', 'apps/**/*.ts', 'e2e/**/*.ts', 'index.ts', 'storybook/stories/**/*.ts', 'examples/**/*.ts'], + references: [ + { + path: './tsconfig.node.json', + }, + ], +}; + +const importmap = createImportMap({ + rootDir: './src', + additionalImports: { + '@umbraco-cms/internal/test-utils': './utils/test-utils.ts', + }, +}); + +const paths = {}; + +for (const [key, value] of Object.entries(importmap.imports)) { + const valueAsArray = [value]; + paths[key] = valueAsArray; +} + +tsConfigBase.compilerOptions.paths = paths; + +const content = tsconfigComment + JSON.stringify(tsConfigBase, null, ' '); +const formattedContent = await format(content, { + parser: 'json', +}); + +writeFileSync(tsconfigPath, formattedContent); diff --git a/src/Umbraco.Web.UI.Client/e2e/installer.spec.ts b/src/Umbraco.Web.UI.Client/e2e/installer.spec.ts index 7e2a621f26..9ecfc9d40f 100644 --- a/src/Umbraco.Web.UI.Client/e2e/installer.spec.ts +++ b/src/Umbraco.Web.UI.Client/e2e/installer.spec.ts @@ -1,7 +1,11 @@ const { rest } = window.MockServiceWorker; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; -import { ProblemDetails, RuntimeLevelModel, ServerStatusResponseModel } from '@umbraco-cms/backoffice/backend-api'; +import { + ProblemDetails, + RuntimeLevelModel, + ServerStatusResponseModel, +} from '@umbraco-cms/backoffice/external/backend-api'; import { expect, test } from './test.js'; test.describe('installer tests', () => { @@ -14,9 +18,9 @@ test.describe('installer tests', () => { ctx.status(200), ctx.json({ serverStatus: RuntimeLevelModel.INSTALL, - }) + }), ); - }) + }), ); await page.goto('/install'); @@ -69,9 +73,9 @@ test.describe('installer tests', () => { errors: { databaseName: ['The database name is required'], }, - }) + }), ); - }) + }), ); await page.click('[aria-label="Install"]'); diff --git a/src/Umbraco.Web.UI.Client/e2e/upgrader.spec.ts b/src/Umbraco.Web.UI.Client/e2e/upgrader.spec.ts index 8e719ebec4..85def2dff4 100644 --- a/src/Umbraco.Web.UI.Client/e2e/upgrader.spec.ts +++ b/src/Umbraco.Web.UI.Client/e2e/upgrader.spec.ts @@ -1,6 +1,10 @@ const { rest } = window.MockServiceWorker; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; -import { ProblemDetails, RuntimeLevelModel, ServerStatusResponseModel } from '@umbraco-cms/backoffice/backend-api'; +import { + ProblemDetails, + RuntimeLevelModel, + ServerStatusResponseModel, +} from '@umbraco-cms/backoffice/external/backend-api'; import { expect, test } from './test.js'; test.describe('upgrader tests', () => { @@ -13,9 +17,9 @@ test.describe('upgrader tests', () => { ctx.status(200), ctx.json({ serverStatus: RuntimeLevelModel.UPGRADE, - }) + }), ); - }) + }), ); await page.goto('/upgrade'); @@ -47,9 +51,9 @@ test.describe('upgrader tests', () => { status: 400, type: 'error', detail: 'Something went wrong', - }) + }), ); - }) + }), ); await page.click('[data-test="continue-button"]'); diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json index f77bb7b747..69e0f1c1b8 100644 --- a/src/Umbraco.Web.UI.Client/package-lock.json +++ b/src/Umbraco.Web.UI.Client/package-lock.json @@ -1,12 +1,12 @@ { "name": "@umbraco-cms/backoffice", - "version": "14.0.0--preview005", + "version": "14.0.0--preview006", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@umbraco-cms/backoffice", - "version": "14.0.0--preview005", + "version": "14.0.0--preview006", "license": "MIT", "dependencies": { "@openid/appauth": "^1.3.1", @@ -61,6 +61,7 @@ "eslint-plugin-local-rules": "^2.0.1", "eslint-plugin-storybook": "^0.6.15", "eslint-plugin-wc": "^2.0.4", + "glob": "^10.3.10", "lucide-static": "^0.290.0", "msw": "^1.3.2", "openapi-typescript-codegen": "^0.25.0", @@ -4127,6 +4128,37 @@ } } }, + "node_modules/@rollup/plugin-commonjs/node_modules/glob": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", + "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", + "dev": true, + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^5.0.1", + "once": "^1.3.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/@rollup/plugin-commonjs/node_modules/minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "dev": true, + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/@rollup/plugin-json": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/@rollup/plugin-json/-/plugin-json-6.1.0.tgz", @@ -5262,28 +5294,6 @@ "url": "https://github.com/chalk/chalk?sponsor=1" } }, - "node_modules/@storybook/core-common/node_modules/glob": { - "version": "10.3.10", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz", - "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==", - "dev": true, - "dependencies": { - "foreground-child": "^3.1.0", - "jackspeak": "^2.3.5", - "minimatch": "^9.0.1", - "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0", - "path-scurry": "^1.10.1" - }, - "bin": { - "glob": "dist/esm/bin.mjs" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/@storybook/core-common/node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -12803,19 +12813,22 @@ "dev": true }, "node_modules/glob": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", - "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", + "version": "10.3.10", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz", + "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==", "dev": true, "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^5.0.1", - "once": "^1.3.0" + "foreground-child": "^3.1.0", + "jackspeak": "^2.3.5", + "minimatch": "^9.0.1", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0", + "path-scurry": "^1.10.1" + }, + "bin": { + "glob": "dist/esm/bin.mjs" }, "engines": { - "node": ">=12" + "node": ">=16 || 14 >=14.17" }, "funding": { "url": "https://github.com/sponsors/isaacs" @@ -12839,18 +12852,6 @@ "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==", "dev": true }, - "node_modules/glob/node_modules/minimatch": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", - "dev": true, - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/global-modules": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz", diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json index 214a9d0afb..16b8716758 100644 --- a/src/Umbraco.Web.UI.Client/package.json +++ b/src/Umbraco.Web.UI.Client/package.json @@ -15,7 +15,8 @@ "./observable-api": "./dist-cms/libs/observable-api/index.js", "./auth": "./dist-cms/shared/auth/index.js", "./event": "./dist-cms/packages/core/event/index.js", - "./icon": "./dist-cms/shared/icon/index.js", + "./lit-element": "./dist-cms/packages/core/lit-element/index.js", + "./icon": "./dist-cms/shared/icon-registry/index.js", "./models": "./dist-cms/shared/models/index.js", "./resources": "./dist-cms/shared/resources/index.js", "./router": "./dist-cms/shared/router/index.js", @@ -52,7 +53,7 @@ "./temporary-file": "./dist-cms/packages/core/temporary-file/index.js", "./block": "./dist-cms/packages/block/index.js", "./audit-log": "./dist-cms/packages/audit-log/index.js", - "./dictionary": "./dist-cms/packages/dictionary/dictionary/index.js", + "./dictionary": "./dist-cms/packages/dictionary/index.js", "./document": "./dist-cms/packages/documents/documents/index.js", "./document-blueprint": "./dist-cms/packages/documents/document-blueprints/index.js", "./document-type": "./dist-cms/packages/documents/document-types/index.js", @@ -64,7 +65,7 @@ "./package": "./dist-cms/packages/packages/package/index.js", "./language": "./dist-cms/packages/language/index.js", "./dynamic-root": "./dist-cms/packages/dynamic-root/index.js", - "./logviewer": "./dist-cms/packages/settings/logviewer/index.js", + "./log-viewer": "./dist-cms/packages/log-viewer/index.js", "./relation-type": "./dist-cms/packages/relations/relation-types/index.js", "./relations": "./dist-cms/packages/relations/relations/index.js", "./tags": "./dist-cms/packages/tags/index.js", @@ -77,9 +78,18 @@ "./user": "./dist-cms/packages/user/user/index.js", "./user-permission": "./dist-cms/packages/user/user-permission/index.js", "./code-editor": "./dist-cms/packages/templating/code-editor/index.js", - "./external/*": "./dist-cms/external/*/index.js", - "./examples/*": "./examples/*/index.js", - "./examples": "./examples/index.js" + "./external/backend-api": "./dist-cms/external/backend-api/index.js", + "./external/dompurify": "./dist-cms/external/dompurify/index.js", + "./external/lit": "./dist-cms/external/lit/index.js", + "./external/lodash": "./dist-cms/external/lodash/index.js", + "./external/marked": "./dist-cms/external/marked/index.js", + "./external/monaco-editor": "./dist-cms/external/monaco-editor/index.js", + "./external/openid": "./dist-cms/external/openid/index.js", + "./external/router-slot": "./dist-cms/external/router-slot/index.js", + "./external/rxjs": "./dist-cms/external/rxjs/index.js", + "./external/tinymce": "./dist-cms/external/tinymce/index.js", + "./external/uui": "./dist-cms/external/uui/index.js", + "./external/uuid": "./dist-cms/external/uuid/index.js" }, "files": [ "dist-cms", @@ -105,7 +115,7 @@ "build:for:cms": "npm run build && node ./devops/build/copy-to-cms.js", "build:for:static": "vite build", "build:vite": "tsc && vite build --mode staging", - "build": "tsc --project ./src/tsconfig.build.json && rollup -c ./src/rollup.config.js", + "build": "tsc --project ./src/tsconfig.build.json && rollup -c ./src/rollup.config.js && npm run package:validate", "check": "npm run lint:errors && npm run compile && npm run build-storybook && npm run generate:jsonschema:dist", "compile": "tsc", "dev": "vite", @@ -131,7 +141,9 @@ "test:watch": "web-test-runner --watch", "test": "web-test-runner --coverage", "wc-analyze:vscode": "wca **/*.element.ts --format vscode --outFile dist-cms/vscode-html-custom-data.json", - "wc-analyze": "wca **/*.element.ts --outFile dist-cms/custom-elements.json" + "wc-analyze": "wca **/*.element.ts --outFile dist-cms/custom-elements.json", + "generate:tsconfig": "node ./devops/tsconfig/index.js", + "package:validate": "node ./devops/package/validate-exports.js" }, "engines": { "node": ">=20.9 <21", @@ -190,6 +202,7 @@ "eslint-plugin-local-rules": "^2.0.1", "eslint-plugin-storybook": "^0.6.15", "eslint-plugin-wc": "^2.0.4", + "glob": "^10.3.10", "lucide-static": "^0.290.0", "msw": "^1.3.2", "openapi-typescript-codegen": "^0.25.0", diff --git a/src/Umbraco.Web.UI.Client/src/apps/app/app-error.element.ts b/src/Umbraco.Web.UI.Client/src/apps/app/app-error.element.ts index ad0a977421..a071967bc6 100644 --- a/src/Umbraco.Web.UI.Client/src/apps/app/app-error.element.ts +++ b/src/Umbraco.Web.UI.Client/src/apps/app/app-error.element.ts @@ -1,6 +1,6 @@ import { css, html, nothing, customElement, property } from '@umbraco-cms/backoffice/external/lit'; -import type { ProblemDetails } from '@umbraco-cms/backoffice/backend-api'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import type { ProblemDetails } from '@umbraco-cms/backoffice/external/backend-api'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; /** * A full page error element that can be used either solo or for instance as the error 500 page and BootFailed diff --git a/src/Umbraco.Web.UI.Client/src/apps/app/app.element.ts b/src/Umbraco.Web.UI.Client/src/apps/app/app.element.ts index 88aa57b3ef..d104ccab6c 100644 --- a/src/Umbraco.Web.UI.Client/src/apps/app/app.element.ts +++ b/src/Umbraco.Web.UI.Client/src/apps/app/app.element.ts @@ -6,10 +6,10 @@ import { UMB_STORAGE_REDIRECT_URL, UmbAuthContext } from '@umbraco-cms/backoffic import { css, html, customElement, property } from '@umbraco-cms/backoffice/external/lit'; import { UUIIconRegistryEssential } from '@umbraco-cms/backoffice/external/uui'; import { UmbIconRegistry } from '@umbraco-cms/backoffice/icon'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { Guard, UmbRoute } from '@umbraco-cms/backoffice/router'; import { pathWithoutBasePath } from '@umbraco-cms/backoffice/router'; -import { OpenAPI, RuntimeLevelModel } from '@umbraco-cms/backoffice/backend-api'; +import { OpenAPI, RuntimeLevelModel } from '@umbraco-cms/backoffice/external/backend-api'; import { UmbContextDebugController } from '@umbraco-cms/backoffice/debug'; @customElement('umb-app') diff --git a/src/Umbraco.Web.UI.Client/src/apps/app/server-connection.ts b/src/Umbraco.Web.UI.Client/src/apps/app/server-connection.ts index fbabfa9b7b..d0e53c6559 100644 --- a/src/Umbraco.Web.UI.Client/src/apps/app/server-connection.ts +++ b/src/Umbraco.Web.UI.Client/src/apps/app/server-connection.ts @@ -1,4 +1,4 @@ -import { RuntimeLevelModel, ServerResource } from '@umbraco-cms/backoffice/backend-api'; +import { RuntimeLevelModel, ServerResource } from '@umbraco-cms/backoffice/external/backend-api'; import { UmbBooleanState } from '@umbraco-cms/backoffice/observable-api'; import { tryExecute } from '@umbraco-cms/backoffice/resources'; diff --git a/src/Umbraco.Web.UI.Client/src/apps/backoffice/backoffice.element.ts b/src/Umbraco.Web.UI.Client/src/apps/backoffice/backoffice.element.ts index 6738d0cda5..ba15e436e5 100644 --- a/src/Umbraco.Web.UI.Client/src/apps/backoffice/backoffice.element.ts +++ b/src/Umbraco.Web.UI.Client/src/apps/backoffice/backoffice.element.ts @@ -6,7 +6,7 @@ import { UmbBundleExtensionInitializer, UmbEntryPointExtensionInitializer, } from '@umbraco-cms/backoffice/extension-api'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import './components/index.js'; diff --git a/src/Umbraco.Web.UI.Client/src/apps/backoffice/components/backoffice-header-sections.element.ts b/src/Umbraco.Web.UI.Client/src/apps/backoffice/components/backoffice-header-sections.element.ts index 659a79fbaa..12a8fac134 100644 --- a/src/Umbraco.Web.UI.Client/src/apps/backoffice/components/backoffice-header-sections.element.ts +++ b/src/Umbraco.Web.UI.Client/src/apps/backoffice/components/backoffice-header-sections.element.ts @@ -1,9 +1,9 @@ import { UMB_BACKOFFICE_CONTEXT } from '../backoffice.context.js'; import type { UmbBackofficeContext } from '../backoffice.context.js'; -import type { CSSResultGroup} from '@umbraco-cms/backoffice/external/lit'; +import type { CSSResultGroup } from '@umbraco-cms/backoffice/external/lit'; import { css, html, customElement, state, repeat } from '@umbraco-cms/backoffice/external/lit'; import type { ManifestSection } from '@umbraco-cms/backoffice/extension-registry'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbExtensionManifestInitializer } from '@umbraco-cms/backoffice/extension-api'; @customElement('umb-backoffice-header-sections') diff --git a/src/Umbraco.Web.UI.Client/src/apps/backoffice/components/backoffice-header.element.ts b/src/Umbraco.Web.UI.Client/src/apps/backoffice/components/backoffice-header.element.ts index 3061130528..b6ae5988b9 100644 --- a/src/Umbraco.Web.UI.Client/src/apps/backoffice/components/backoffice-header.element.ts +++ b/src/Umbraco.Web.UI.Client/src/apps/backoffice/components/backoffice-header.element.ts @@ -1,6 +1,6 @@ -import type { CSSResultGroup} from '@umbraco-cms/backoffice/external/lit'; +import type { CSSResultGroup } from '@umbraco-cms/backoffice/external/lit'; import { css, html, customElement } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-backoffice-header') export class UmbBackofficeHeaderElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/apps/backoffice/components/backoffice-main.element.ts b/src/Umbraco.Web.UI.Client/src/apps/backoffice/components/backoffice-main.element.ts index e4f01ee751..a04f0fad35 100644 --- a/src/Umbraco.Web.UI.Client/src/apps/backoffice/components/backoffice-main.element.ts +++ b/src/Umbraco.Web.UI.Client/src/apps/backoffice/components/backoffice-main.element.ts @@ -1,12 +1,12 @@ -import type { UmbBackofficeContext} from '../backoffice.context.js'; +import type { UmbBackofficeContext } from '../backoffice.context.js'; import { UMB_BACKOFFICE_CONTEXT } from '../backoffice.context.js'; import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; import { UmbSectionContext, UMB_SECTION_CONTEXT } from '@umbraco-cms/backoffice/section'; import type { UmbRoute, UmbRouterSlotChangeEvent } from '@umbraco-cms/backoffice/router'; import type { ManifestSection, UmbSectionElement } from '@umbraco-cms/backoffice/extension-registry'; -import type { UmbExtensionManifestInitializer} from '@umbraco-cms/backoffice/extension-api'; +import type { UmbExtensionManifestInitializer } from '@umbraco-cms/backoffice/extension-api'; import { createExtensionElement } from '@umbraco-cms/backoffice/extension-api'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-backoffice-main') export class UmbBackofficeMainElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/apps/backoffice/server-extension-registrator.controller.ts b/src/Umbraco.Web.UI.Client/src/apps/backoffice/server-extension-registrator.controller.ts index da091c418f..1eef6bad1f 100644 --- a/src/Umbraco.Web.UI.Client/src/apps/backoffice/server-extension-registrator.controller.ts +++ b/src/Umbraco.Web.UI.Client/src/apps/backoffice/server-extension-registrator.controller.ts @@ -1,9 +1,9 @@ -import { PackageResource, OpenAPI } from '@umbraco-cms/backoffice/backend-api'; +import { PackageResource, OpenAPI } from '@umbraco-cms/backoffice/external/backend-api'; import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import type { UmbBackofficeExtensionRegistry } from '@umbraco-cms/backoffice/extension-registry'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; -import type { ManifestBase} from '@umbraco-cms/backoffice/extension-api'; +import type { ManifestBase } from '@umbraco-cms/backoffice/extension-api'; import { isManifestBaseType } from '@umbraco-cms/backoffice/extension-api'; // TODO: consider if this can be replaced by the new extension controllers diff --git a/src/Umbraco.Web.UI.Client/src/apps/installer/consent/installer-consent.element.ts b/src/Umbraco.Web.UI.Client/src/apps/installer/consent/installer-consent.element.ts index d5ab966a35..282505cffe 100644 --- a/src/Umbraco.Web.UI.Client/src/apps/installer/consent/installer-consent.element.ts +++ b/src/Umbraco.Web.UI.Client/src/apps/installer/consent/installer-consent.element.ts @@ -1,15 +1,14 @@ -import type { UmbInstallerContext} from '../installer.context.js'; +import type { UmbInstallerContext } from '../installer.context.js'; import { UMB_INSTALLER_CONTEXT } from '../installer.context.js'; -import type { CSSResultGroup} from '@umbraco-cms/backoffice/external/lit'; +import type { CSSResultGroup } from '@umbraco-cms/backoffice/external/lit'; import { css, html, customElement, state, unsafeHTML } from '@umbraco-cms/backoffice/external/lit'; import type { ConsentLevelPresentationModel, - TelemetryResponseModel} from '@umbraco-cms/backoffice/backend-api'; -import { - TelemetryLevelModel, -} from '@umbraco-cms/backoffice/backend-api'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; + TelemetryResponseModel, +} from '@umbraco-cms/backoffice/external/backend-api'; +import { TelemetryLevelModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-installer-consent') export class UmbInstallerConsentElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/apps/installer/database/installer-database.element.ts b/src/Umbraco.Web.UI.Client/src/apps/installer/database/installer-database.element.ts index 8a877e2926..66ce27cd73 100644 --- a/src/Umbraco.Web.UI.Client/src/apps/installer/database/installer-database.element.ts +++ b/src/Umbraco.Web.UI.Client/src/apps/installer/database/installer-database.element.ts @@ -8,9 +8,9 @@ import type { DatabaseInstallRequestModel, DatabaseSettingsPresentationModel, ProblemDetails, -} from '@umbraco-cms/backoffice/backend-api'; -import { ApiError, InstallResource } from '@umbraco-cms/backoffice/backend-api'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +} from '@umbraco-cms/backoffice/external/backend-api'; +import { ApiError, InstallResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { tryExecute } from '@umbraco-cms/backoffice/resources'; @customElement('umb-installer-database') diff --git a/src/Umbraco.Web.UI.Client/src/apps/installer/error/installer-error.element.ts b/src/Umbraco.Web.UI.Client/src/apps/installer/error/installer-error.element.ts index 8694541d81..9b754b8ffe 100644 --- a/src/Umbraco.Web.UI.Client/src/apps/installer/error/installer-error.element.ts +++ b/src/Umbraco.Web.UI.Client/src/apps/installer/error/installer-error.element.ts @@ -1,9 +1,9 @@ -import type { UmbInstallerContext} from '../installer.context.js'; +import type { UmbInstallerContext } from '../installer.context.js'; import { UMB_INSTALLER_CONTEXT } from '../installer.context.js'; -import type { CSSResultGroup} from '@umbraco-cms/backoffice/external/lit'; +import type { CSSResultGroup } from '@umbraco-cms/backoffice/external/lit'; import { css, html, nothing, customElement, state } from '@umbraco-cms/backoffice/external/lit'; -import type { ProblemDetails } from '@umbraco-cms/backoffice/backend-api'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import type { ProblemDetails } from '@umbraco-cms/backoffice/external/backend-api'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-installer-error') export class UmbInstallerErrorElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/apps/installer/installer.context.ts b/src/Umbraco.Web.UI.Client/src/apps/installer/installer.context.ts index 7671d306fc..6950a0f0ec 100644 --- a/src/Umbraco.Web.UI.Client/src/apps/installer/installer.context.ts +++ b/src/Umbraco.Web.UI.Client/src/apps/installer/installer.context.ts @@ -3,8 +3,8 @@ import type { InstallSettingsResponseModel, ProblemDetails, InstallRequestModel, -} from '@umbraco-cms/backoffice/backend-api'; -import { InstallResource, TelemetryLevelModel } from '@umbraco-cms/backoffice/backend-api'; +} from '@umbraco-cms/backoffice/external/backend-api'; +import { InstallResource, TelemetryLevelModel } from '@umbraco-cms/backoffice/external/backend-api'; import { tryExecute } from '@umbraco-cms/backoffice/resources'; import { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; import { UmbObjectState, UmbNumberState } from '@umbraco-cms/backoffice/observable-api'; diff --git a/src/Umbraco.Web.UI.Client/src/apps/installer/installer.element.ts b/src/Umbraco.Web.UI.Client/src/apps/installer/installer.element.ts index 94e27b85e8..5b856607a3 100644 --- a/src/Umbraco.Web.UI.Client/src/apps/installer/installer.element.ts +++ b/src/Umbraco.Web.UI.Client/src/apps/installer/installer.element.ts @@ -1,7 +1,7 @@ import { UmbInstallerContext, UMB_INSTALLER_CONTEXT } from './installer.context.js'; -import type { CSSResultGroup} from '@umbraco-cms/backoffice/external/lit'; +import type { CSSResultGroup } from '@umbraco-cms/backoffice/external/lit'; import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import './consent/installer-consent.element.js'; import './database/installer-database.element.js'; diff --git a/src/Umbraco.Web.UI.Client/src/apps/installer/user/installer-user.element.ts b/src/Umbraco.Web.UI.Client/src/apps/installer/user/installer-user.element.ts index e1e13f2808..504b616071 100644 --- a/src/Umbraco.Web.UI.Client/src/apps/installer/user/installer-user.element.ts +++ b/src/Umbraco.Web.UI.Client/src/apps/installer/user/installer-user.element.ts @@ -1,8 +1,8 @@ -import type { UmbInstallerContext} from '../installer.context.js'; +import type { UmbInstallerContext } from '../installer.context.js'; import { UMB_INSTALLER_CONTEXT } from '../installer.context.js'; -import type { CSSResultGroup} from '@umbraco-cms/backoffice/external/lit'; +import type { CSSResultGroup } from '@umbraco-cms/backoffice/external/lit'; import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-installer-user') export class UmbInstallerUserElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/apps/upgrader/upgrader-view.element.ts b/src/Umbraco.Web.UI.Client/src/apps/upgrader/upgrader-view.element.ts index b421c84536..24a9934028 100644 --- a/src/Umbraco.Web.UI.Client/src/apps/upgrader/upgrader-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/apps/upgrader/upgrader-view.element.ts @@ -1,14 +1,6 @@ -import type { - CSSResultGroup} from '@umbraco-cms/backoffice/external/lit'; -import { - css, - html, - LitElement, - customElement, - property, - ifDefined, -} from '@umbraco-cms/backoffice/external/lit'; -import type { UpgradeSettingsResponseModel } from '@umbraco-cms/backoffice/backend-api'; +import type { CSSResultGroup } from '@umbraco-cms/backoffice/external/lit'; +import { css, html, LitElement, customElement, property, ifDefined } from '@umbraco-cms/backoffice/external/lit'; +import type { UpgradeSettingsResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; /** * @element umb-upgrader-view diff --git a/src/Umbraco.Web.UI.Client/src/apps/upgrader/upgrader.element.ts b/src/Umbraco.Web.UI.Client/src/apps/upgrader/upgrader.element.ts index 4a7ef907ef..3b1c1b35c0 100644 --- a/src/Umbraco.Web.UI.Client/src/apps/upgrader/upgrader.element.ts +++ b/src/Umbraco.Web.UI.Client/src/apps/upgrader/upgrader.element.ts @@ -1,8 +1,8 @@ import { html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; -import type { UpgradeSettingsResponseModel} from '@umbraco-cms/backoffice/backend-api'; -import { UpgradeResource, ApiError } from '@umbraco-cms/backoffice/backend-api'; +import type { UpgradeSettingsResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { UpgradeResource, ApiError } from '@umbraco-cms/backoffice/external/backend-api'; import { tryExecute } from '@umbraco-cms/backoffice/resources'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import '../installer/shared/layout/installer-layout.element.js'; import './upgrader-view.element.js'; diff --git a/src/Umbraco.Web.UI.Client/src/assets/lang/en-us.ts b/src/Umbraco.Web.UI.Client/src/assets/lang/en-us.ts index 8a10ec8a7f..626e399b24 100644 --- a/src/Umbraco.Web.UI.Client/src/assets/lang/en-us.ts +++ b/src/Umbraco.Web.UI.Client/src/assets/lang/en-us.ts @@ -1563,7 +1563,7 @@ export default { enableListViewDescription: 'Configures the content item to show a sortable and searchable list of its\n children, the children will not be shown in the tree\n ', allowedTemplatesHeading: 'Allowed Templates', - allowedTemplatesDescription: 'Choose which templates editors are allowed to use on content of this type\n ', + allowedTemplatesDescription: 'Choose which templates editors are allowed to use on content of this type', allowAsRootHeading: 'Allow as root', allowAsRootDescription: 'Allow editors to create content of this type in the root of the content tree.\n ', childNodesHeading: 'Allowed child node types', diff --git a/src/Umbraco.Web.UI.Client/src/css/umbraco-blockgridlayout.css b/src/Umbraco.Web.UI.Client/src/css/umbraco-blockgridlayout.css new file mode 100644 index 0000000000..a03c585ba6 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/css/umbraco-blockgridlayout.css @@ -0,0 +1,50 @@ +.umb-block-grid__layout-container { + position: relative; + display: grid; + grid-template-columns: repeat(var(--umb-block-grid--grid-columns, 1), minmax(0, 1fr)); + grid-auto-flow: row; + grid-auto-rows: minmax(50px, min-content); + + column-gap: var(--umb-block-grid--column-gap, 0); + row-gap: var(--umb-block-grid--row-gap, 0); +} +.umb-block-grid__layout-item { + position: relative; + /* For small devices we scale columnSpan by three, to make everything bigger than 1/3 take full width: */ + grid-column-end: span min(calc(var(--umb-block-grid--item-column-span, 1) * 3), var(--umb-block-grid--grid-columns)); + grid-row: span var(--umb-block-grid--item-row-span, 1); +} + +.umb-block-grid__area-container, +.umb-block-grid__block--view::part(area-container) { + position: relative; + display: grid; + grid-template-columns: repeat( + var(--umb-block-grid--area-grid-columns, var(--umb-block-grid--grid-columns, 1)), + minmax(0, 1fr) + ); + grid-auto-flow: row; + grid-auto-rows: minmax(50px, min-content); + + column-gap: var(--umb-block-grid--areas-column-gap, 0); + row-gap: var(--umb-block-grid--areas-row-gap, 0); +} +.umb-block-grid__area { + position: relative; + height: 100%; + display: flex; + flex-direction: column; + /* For small devices we scale columnSpan by three, to make everything bigger than 1/3 take full width: */ + grid-column-end: span + min(calc(var(--umb-block-grid--area-column-span, 1) * 3), var(--umb-block-grid--area-grid-columns)); + grid-row: span var(--umb-block-grid--area-row-span, 1); +} + +@media (min-width: 1024px) { + .umb-block-grid__layout-item { + grid-column-end: span min(var(--umb-block-grid--item-column-span, 1), var(--umb-block-grid--grid-columns)); + } + .umb-block-grid__area { + grid-column-end: span min(var(--umb-block-grid--area-column-span, 1), var(--umb-block-grid--area-grid-columns)); + } +} diff --git a/src/Umbraco.Web.UI.Client/src/libs/context-api/provide/context-provider.controller.test.ts b/src/Umbraco.Web.UI.Client/src/libs/context-api/provide/context-provider.controller.test.ts index 48039ad776..6a82b7a77d 100644 --- a/src/Umbraco.Web.UI.Client/src/libs/context-api/provide/context-provider.controller.test.ts +++ b/src/Umbraco.Web.UI.Client/src/libs/context-api/provide/context-provider.controller.test.ts @@ -1,7 +1,7 @@ import { expect, fixture, defineCE } from '@open-wc/testing'; import { UmbContextConsumer } from '../consume/context-consumer.js'; import { UmbContextProviderController } from './context-provider.controller.js'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; class UmbTestContextProviderControllerClass { prop = 'value from provider'; diff --git a/src/Umbraco.Web.UI.Client/src/libs/observable-api/utils/append-to-frozen-array.function.ts b/src/Umbraco.Web.UI.Client/src/libs/observable-api/utils/append-to-frozen-array.function.ts index 23510e754c..0f7eba5a52 100644 --- a/src/Umbraco.Web.UI.Client/src/libs/observable-api/utils/append-to-frozen-array.function.ts +++ b/src/Umbraco.Web.UI.Client/src/libs/observable-api/utils/append-to-frozen-array.function.ts @@ -1,11 +1,12 @@ /** * @export * @method appendToFrozenArray - * @param {Observable} source - RxJS Subject to use for this Observable. - * @param {(mappable: T) => R} mappingFunction - Method to return the part for this Observable to return. - * @param {(previousResult: R, currentResult: R) => boolean} [memoizationFunction] - Method to Compare if the data has changed. Should return true when data is different. - * @description - Creates a RxJS Observable from RxJS Subject. - * @example Example append new entry for a ArrayState or a part of UmbDeepState/UmbObjectState it which is an array. Where the key is unique and the item will be updated if matched with existing. + * @param {Array} source - An Array which is frozen and should be updated. + * @param {T} entry - A new entry to append to the array. + * @param {(entry: T) => unknown} getUniqueMethod - Method to retrieve a value of an entry that is unique to it. This enables the method to replace existing value if it matches the unique value. + * @returns {Array} - Returns a new array with the new entry appended. + * @description - Inserts or replaces an entry in a frozen array and returns a new array. + * @example Example append new entry for a UmbArrayState or a part of UmbObjectState/UmbDeepState which is an array. Where the key is unique and the item will be updated if matched with existing. * const entry = {id: 'myKey', value: 'myValue'}; * const newDataSet = appendToFrozenArray(mySubject.getValue(), entry, x => x.id === id); * mySubject.next(newDataSet); diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/audit-log.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/audit-log.data.ts index 5978154555..590190de7e 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/audit-log.data.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/audit-log.data.ts @@ -1,7 +1,10 @@ import { data as userData } from './user/user.data.js'; import { data as documentData } from './document/document.data.js'; -import type { AuditLogResponseModel, AuditLogWithUsernameResponseModel } from '@umbraco-cms/backoffice/backend-api'; -import { AuditTypeModel } from '@umbraco-cms/backoffice/backend-api'; +import type { + AuditLogResponseModel, + AuditLogWithUsernameResponseModel, +} from '@umbraco-cms/backoffice/external/backend-api'; +import { AuditTypeModel } from '@umbraco-cms/backoffice/external/backend-api'; const userId = userData[0].id; const userName = userData[0].name; diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/culture.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/culture.data.ts index 68fd93e4cf..9aa0bf353a 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/culture.data.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/culture.data.ts @@ -1,4 +1,4 @@ -import type { CultureReponseModel, PagedCultureReponseModel } from '@umbraco-cms/backoffice/backend-api'; +import type { CultureReponseModel, PagedCultureReponseModel } from '@umbraco-cms/backoffice/external/backend-api'; class UmbCulturesData { get(): PagedCultureReponseModel { diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/data-type/data-type.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/data-type/data-type.data.ts index d31f650109..3087789c13 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/data-type/data-type.data.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/data-type/data-type.data.ts @@ -2,7 +2,7 @@ import type { DataTypeItemResponseModel, DataTypeResponseModel, DataTypeTreeItemResponseModel, -} from '@umbraco-cms/backoffice/backend-api'; +} from '@umbraco-cms/backoffice/external/backend-api'; type UmbMockDataTypeModelHack = DataTypeResponseModel & DataTypeTreeItemResponseModel & DataTypeItemResponseModel; @@ -559,7 +559,7 @@ export const data: Array = [ }, { alias: 'useInlineEditingAsDefault', - value: false, + value: true, }, { alias: 'useLiveEditing', diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/data-type/data-type.db.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/data-type/data-type.db.ts index 6b0d7f8375..5c52ca41f9 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/data-type/data-type.db.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/data-type/data-type.db.ts @@ -12,7 +12,7 @@ import type { CreateFolderRequestModel, DataTypeItemResponseModel, DataTypeResponseModel, -} from '@umbraco-cms/backoffice/backend-api'; +} from '@umbraco-cms/backoffice/external/backend-api'; class UmbDataTypeMockDB extends UmbEntityMockDbBase { tree = new UmbMockEntityTreeManager(this, folderTreeItemMapper); diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/dictionary/dictionary.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/dictionary/dictionary.data.ts index 9b487439c0..8b7eb598f7 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/dictionary/dictionary.data.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/dictionary/dictionary.data.ts @@ -3,7 +3,7 @@ import type { DictionaryItemResponseModel, DictionaryOverviewResponseModel, NamedEntityTreeItemResponseModel, -} from '@umbraco-cms/backoffice/backend-api'; +} from '@umbraco-cms/backoffice/external/backend-api'; type UmbMockDictionaryModelHack = DictionaryItemResponseModel & NamedEntityTreeItemResponseModel & diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/dictionary/dictionary.db.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/dictionary/dictionary.db.ts index b29a80e227..191f854604 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/dictionary/dictionary.db.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/dictionary/dictionary.db.ts @@ -11,7 +11,7 @@ import type { DictionaryItemItemResponseModel, PagedDictionaryOverviewResponseModel, DictionaryOverviewResponseModel, -} from '@umbraco-cms/backoffice/backend-api'; +} from '@umbraco-cms/backoffice/external/backend-api'; import { UmbId } from '@umbraco-cms/backoffice/id'; export class UmbDictionaryMockDB extends UmbEntityMockDbBase { diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/document-type/document-type.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/document-type/document-type.data.ts index 071ec1a4f3..abc161251c 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/document-type/document-type.data.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/document-type/document-type.data.ts @@ -1,9 +1,9 @@ -import { CompositionTypeModel } from '@umbraco-cms/backoffice/backend-api'; +import { CompositionTypeModel } from '@umbraco-cms/backoffice/external/backend-api'; import type { DocumentTypeItemResponseModel, DocumentTypeResponseModel, DocumentTypeTreeItemResponseModel, -} from '@umbraco-cms/backoffice/backend-api'; +} from '@umbraco-cms/backoffice/external/backend-api'; type UmbMockDocumentTypeModelHack = DocumentTypeResponseModel & DocumentTypeTreeItemResponseModel & diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/document-type/document-type.db.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/document-type/document-type.db.ts index 372259383e..a04baedb89 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/document-type/document-type.db.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/document-type/document-type.db.ts @@ -15,7 +15,7 @@ import type { DocumentTypeSortModel, DocumentTypeTreeItemResponseModel, PagedAllowedDocumentTypeModel, -} from '@umbraco-cms/backoffice/backend-api'; +} from '@umbraco-cms/backoffice/external/backend-api'; class UmbDocumentTypeMockDB extends UmbEntityMockDbBase { tree = new UmbMockEntityTreeManager(this, documentTypeTreeItemMapper); diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/document/document-publishing.manager.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/document/document-publishing.manager.ts index 34bf20a60d..15b7d9c6fe 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/document/document-publishing.manager.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/document/document-publishing.manager.ts @@ -1,7 +1,10 @@ import type { UmbMockDocumentModel } from './document.data.js'; import type { UmbDocumentMockDB } from './document.db.js'; -import type { PublishDocumentRequestModel, UnpublishDocumentRequestModel } from '@umbraco-cms/backoffice/backend-api'; -import { DocumentVariantStateModel } from '@umbraco-cms/backoffice/backend-api'; +import type { + PublishDocumentRequestModel, + UnpublishDocumentRequestModel, +} from '@umbraco-cms/backoffice/external/backend-api'; +import { DocumentVariantStateModel } from '@umbraco-cms/backoffice/external/backend-api'; export class UmbMockDocumentPublishingManager { #documentDb: UmbDocumentMockDB; diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/document/document.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/document/document.data.ts index 491d0c9a31..f0ae2b9b88 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/document/document.data.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/document/document.data.ts @@ -2,8 +2,8 @@ import type { DocumentItemResponseModel, DocumentResponseModel, DocumentTreeItemResponseModel, -} from '@umbraco-cms/backoffice/backend-api'; -import { DocumentVariantStateModel } from '@umbraco-cms/backoffice/backend-api'; +} from '@umbraco-cms/backoffice/external/backend-api'; +import { DocumentVariantStateModel } from '@umbraco-cms/backoffice/external/backend-api'; type UmbMockDocumentTypeModelHack = DocumentResponseModel & DocumentTreeItemResponseModel & DocumentItemResponseModel; @@ -203,6 +203,31 @@ export const data: Array = [ udi: '5678', contentTypeKey: 'all-property-editors-document-type-id', elementProperty: 'Hello world', + textBox: 'Hello world 123', + blockList: { + layout: { + 'Umbraco.BlockList': [ + { + contentUdi: '1234b', + settingsUdi: '5678b', + }, + ], + }, + contentData: [ + { + udi: '1234b', + contentTypeKey: '4f68ba66-6fb2-4778-83b8-6ab4ca3a7c5c', + elementProperty: 'Hello world', + }, + ], + settingsData: [ + { + udi: '5678b', + contentTypeKey: 'all-property-editors-document-type-id', + elementProperty: 'Hello world', + }, + ], + }, }, ], }, @@ -303,7 +328,72 @@ export const data: Array = [ alias: 'blockGrid', culture: null, segment: null, - value: null, + value: { + layout: { + 'Umbraco.BlockGrid': [ + { + contentUdi: '1234', + settingsUdi: '5678', + areas: [ + { + key: 'area1', + items: [ + { + contentUdi: 'a1234', + settingsUdi: 'a5678', + areas: [], + }, + ], + }, + { + key: 'area2', + items: [ + { + contentUdi: 'b1234', + settingsUdi: 'b5678', + areas: [], + }, + ], + }, + ], + }, + ], + }, + contentData: [ + { + udi: '1234', + contentTypeKey: '4f68ba66-6fb2-4778-83b8-6ab4ca3a7c5c', + elementProperty: 'Hello world', + }, + { + udi: 'a1234', + contentTypeKey: '4f68ba66-6fb2-4778-83b8-6ab4ca3a7c5c', + elementProperty: 'Hello world from area 1', + }, + { + udi: 'b1234', + contentTypeKey: '4f68ba66-6fb2-4778-83b8-6ab4ca3a7c5c', + elementProperty: 'Hello world from area 2', + }, + ], + settingsData: [ + { + udi: '5678', + contentTypeKey: 'all-property-editors-document-type-id', + elementProperty: 'Hello world', + }, + { + udi: 'a5678', + contentTypeKey: 'all-property-editors-document-type-id', + elementProperty: 'Hello world from area 1 settings', + }, + { + udi: 'b5678', + contentTypeKey: '4f68ba66-6fb2-4778-83b8-6ab4ca3a7c5c', + elementProperty: 'Hello world from area 2 settings', + }, + ], + }, }, { alias: 'blockGrid', diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/document/document.db.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/document/document.db.ts index ba3e358cdc..d7fcf31015 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/document/document.db.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/document/document.db.ts @@ -13,7 +13,7 @@ import { type DocumentItemResponseModel, type DocumentResponseModel, type DocumentTreeItemResponseModel, -} from '@umbraco-cms/backoffice/backend-api'; +} from '@umbraco-cms/backoffice/external/backend-api'; import { UmbId } from '@umbraco-cms/backoffice/id'; export class UmbDocumentMockDB extends UmbEntityMockDbBase { diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/examine.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/examine.data.ts index f096f16438..297384f0de 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/examine.data.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/examine.data.ts @@ -1,10 +1,9 @@ import type { IndexResponseModel, PagedIndexResponseModel, - SearchResultResponseModel} from '@umbraco-cms/backoffice/backend-api'; -import { - HealthStatusModel -} from '@umbraco-cms/backoffice/backend-api'; + SearchResultResponseModel, +} from '@umbraco-cms/backoffice/external/backend-api'; +import { HealthStatusModel } from '@umbraco-cms/backoffice/external/backend-api'; export function getIndexByName(indexName: string) { return Indexers.find((index) => { diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/health-check.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/health-check.data.ts index bfb85fb276..5b884b0cba 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/health-check.data.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/health-check.data.ts @@ -1,9 +1,8 @@ import type { HealthCheckGroupPresentationModel, - HealthCheckGroupWithResultResponseModel} from '@umbraco-cms/backoffice/backend-api'; -import { - StatusResultTypeModel, -} from '@umbraco-cms/backoffice/backend-api'; + HealthCheckGroupWithResultResponseModel, +} from '@umbraco-cms/backoffice/external/backend-api'; +import { StatusResultTypeModel } from '@umbraco-cms/backoffice/external/backend-api'; export function getGroupByName(name: string) { return healthGroupsWithoutResult.find((group) => group.name?.toLowerCase() == name.toLowerCase()); diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/language/language.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/language/language.data.ts index 0be6f521ac..23f40b60ac 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/language/language.data.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/language/language.data.ts @@ -1,4 +1,4 @@ -import type { LanguageItemResponseModel, LanguageResponseModel } from '@umbraco-cms/backoffice/backend-api'; +import type { LanguageItemResponseModel, LanguageResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; export type UmbMockLanguageModel = LanguageResponseModel & LanguageItemResponseModel; diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/language/language.db.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/language/language.db.ts index 07f3026c1f..02c6554b8b 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/language/language.db.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/language/language.db.ts @@ -7,7 +7,7 @@ import type { CreateLanguageRequestModel, LanguageItemResponseModel, LanguageResponseModel, -} from '@umbraco-cms/backoffice/backend-api'; +} from '@umbraco-cms/backoffice/external/backend-api'; class UmbLanguageMockDB extends UmbCultureMockDbBase { item = new UmbMockCultureItemManager(this, itemResponseMapper); diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/log-viewer.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/log-viewer.data.ts index 061d6d91e7..33f66fb115 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/log-viewer.data.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/log-viewer.data.ts @@ -4,7 +4,7 @@ import type { LogMessageResponseModel, LogTemplateResponseModel, SavedLogSearchResponseModel, -} from '@umbraco-cms/backoffice/backend-api'; +} from '@umbraco-cms/backoffice/external/backend-api'; // Temp mocked database class UmbLogViewerSearchesData extends UmbMockDBBase { diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/logs.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/logs.data.ts index 0fafbc8a38..c6b6a74f32 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/logs.data.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/logs.data.ts @@ -1,5 +1,5 @@ -import type { LogMessageResponseModel } from '@umbraco-cms/backoffice/backend-api'; -import { LogLevelModel } from '@umbraco-cms/backoffice/backend-api'; +import type { LogMessageResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { LogLevelModel } from '@umbraco-cms/backoffice/external/backend-api'; const allLogs = [ { diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/media-type/media-type.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/media-type/media-type.data.ts index 2689b0b0c2..d44124efd4 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/media-type/media-type.data.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/media-type/media-type.data.ts @@ -2,7 +2,7 @@ import type { MediaTypeItemResponseModel, MediaTypeResponseModel, MediaTypeTreeItemResponseModel, -} from '@umbraco-cms/backoffice/backend-api'; +} from '@umbraco-cms/backoffice/external/backend-api'; type UmbMockMediaTypeModelHack = MediaTypeResponseModel & MediaTypeTreeItemResponseModel & MediaTypeItemResponseModel; diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/media-type/media-type.db.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/media-type/media-type.db.ts index 43ddefb724..dc4b98d1f9 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/media-type/media-type.db.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/media-type/media-type.db.ts @@ -12,7 +12,7 @@ import type { MediaTypeItemResponseModel, MediaTypeResponseModel, MediaTypeTreeItemResponseModel, -} from '@umbraco-cms/backoffice/backend-api'; +} from '@umbraco-cms/backoffice/external/backend-api'; class UmbMediaTypeMockDB extends UmbEntityMockDbBase { tree = new UmbMockEntityTreeManager(this, mediaTypeTreeItemMapper); diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/media/media.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/media/media.data.ts index 82be6e12ba..ab0853eea0 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/media/media.data.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/media/media.data.ts @@ -2,7 +2,7 @@ import type { MediaItemResponseModel, MediaResponseModel, MediaTreeItemResponseModel, -} from '@umbraco-cms/backoffice/backend-api'; +} from '@umbraco-cms/backoffice/external/backend-api'; type UmbMockMediaModelHack = MediaResponseModel & MediaTreeItemResponseModel & MediaItemResponseModel; diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/media/media.db.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/media/media.db.ts index f268db4af8..88a0f94b32 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/media/media.db.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/media/media.db.ts @@ -11,7 +11,7 @@ import type { MediaItemResponseModel, MediaResponseModel, MediaTreeItemResponseModel, -} from '@umbraco-cms/backoffice/backend-api'; +} from '@umbraco-cms/backoffice/external/backend-api'; import { UmbId } from '@umbraco-cms/backoffice/id'; export class UmbMediaMockDB extends UmbEntityMockDbBase { diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/member-group.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/member-group.data.ts index 997c4344b1..e52f366557 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/member-group.data.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/member-group.data.ts @@ -3,7 +3,7 @@ import { createEntityTreeItem } from './utils.js'; import type { EntityTreeItemResponseModel, PagedNamedEntityTreeItemResponseModel, -} from '@umbraco-cms/backoffice/backend-api'; +} from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbMemberGroupDetailModel } from '@umbraco-cms/backoffice/member-group'; export const data: Array = [ diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/member-type.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/member-type.data.ts index b82cc59920..d16e9e20b6 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/member-type.data.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/member-type.data.ts @@ -4,7 +4,7 @@ import { createEntityTreeItem } from './utils.js'; import type { NamedEntityTreeItemResponseModel, PagedNamedEntityTreeItemResponseModel, -} from '@umbraco-cms/backoffice/backend-api'; +} from '@umbraco-cms/backoffice/external/backend-api'; export const data: Array = [ { diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/member.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/member.data.ts index 7f5c05ba3d..41cd77e461 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/member.data.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/member.data.ts @@ -4,7 +4,7 @@ import { createEntityTreeItem } from './utils.js'; import type { EntityTreeItemResponseModel, PagedNamedEntityTreeItemResponseModel, -} from '@umbraco-cms/backoffice/backend-api'; +} from '@umbraco-cms/backoffice/external/backend-api'; export const data: Array = [ { diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/object-type/object-type.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/object-type/object-type.data.ts index ced9f0b6c9..33e6d0266f 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/object-type/object-type.data.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/object-type/object-type.data.ts @@ -1,5 +1,5 @@ import { UmbEntityData } from '../entity.data.js'; -import type { ObjectTypeResponseModel } from '@umbraco-cms/backoffice/backend-api'; +import type { ObjectTypeResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; export const data: Array = [ { diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/partial-view/partial-view.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/partial-view/partial-view.data.ts index 4b9900a58b..68fa684dcd 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/partial-view/partial-view.data.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/partial-view/partial-view.data.ts @@ -3,7 +3,7 @@ import type { PartialViewItemResponseModel, PartialViewResponseModel, PartialViewSnippetResponseModel, -} from '@umbraco-cms/backoffice/backend-api'; +} from '@umbraco-cms/backoffice/external/backend-api'; type UmbMockPartialViewModelHack = PartialViewResponseModel & FileSystemTreeItemPresentationModel & diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/partial-view/partial-view.db.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/partial-view/partial-view.db.ts index ce2b74eb26..b4c95c5295 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/partial-view/partial-view.db.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/partial-view/partial-view.db.ts @@ -9,7 +9,7 @@ import type { PagedPartialViewSnippetItemResponseModel, PartialViewSnippetItemResponseModel, PartialViewSnippetResponseModel, -} from '@umbraco-cms/backoffice/backend-api'; +} from '@umbraco-cms/backoffice/external/backend-api'; class UmbPartialViewMockDB extends UmbFileSystemMockDbBase { tree = new UmbMockFileSystemTreeManager(this); diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/relations/relation-type.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/relations/relation-type.data.ts index 98fb76f45b..ae17352881 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/relations/relation-type.data.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/relations/relation-type.data.ts @@ -4,7 +4,7 @@ import type { EntityTreeItemResponseModel, NamedEntityTreeItemResponseModel, RelationTypeResponseModel, -} from '@umbraco-cms/backoffice/backend-api'; +} from '@umbraco-cms/backoffice/external/backend-api'; export const data: Array = [ { diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/relations/relation.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/relations/relation.data.ts index eb2697f274..5ea2903bfa 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/relations/relation.data.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/relations/relation.data.ts @@ -1,5 +1,5 @@ import { UmbEntityData } from '../entity.data.js'; -import type { RelationResponseModel } from '@umbraco-cms/backoffice/backend-api'; +import type { RelationResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; export const data: Array = [ { diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/script/script.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/script/script.data.ts index f3456a78e4..a71cfe367d 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/script/script.data.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/script/script.data.ts @@ -2,7 +2,7 @@ import type { FileSystemTreeItemPresentationModel, ScriptItemResponseModel, ScriptResponseModel, -} from '@umbraco-cms/backoffice/backend-api'; +} from '@umbraco-cms/backoffice/external/backend-api'; type UmbMockScriptModelHack = ScriptResponseModel & FileSystemTreeItemPresentationModel & ScriptItemResponseModel; diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/static-file/static-file.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/static-file/static-file.data.ts index d02945f1b2..052cdaca11 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/static-file/static-file.data.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/static-file/static-file.data.ts @@ -1,7 +1,7 @@ import type { FileSystemTreeItemPresentationModel, StaticFileItemResponseModel, -} from '@umbraco-cms/backoffice/backend-api'; +} from '@umbraco-cms/backoffice/external/backend-api'; type UmbMockStaticFileModelHack = StaticFileItemResponseModel & FileSystemTreeItemPresentationModel; export interface UmbMockStaticFileModel extends Omit {} diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/stylesheet/stylesheet.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/stylesheet/stylesheet.data.ts index 95be7fb3a9..2ce1bcde20 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/stylesheet/stylesheet.data.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/stylesheet/stylesheet.data.ts @@ -2,7 +2,7 @@ import type { FileSystemTreeItemPresentationModel, StylesheetItemResponseModel, StylesheetResponseModel, -} from '@umbraco-cms/backoffice/backend-api'; +} from '@umbraco-cms/backoffice/external/backend-api'; type UmbMockStylesheetModelHack = StylesheetResponseModel & FileSystemTreeItemPresentationModel & diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/template/template-detail.manager.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/template/template-detail.manager.ts index 7f956a2cb0..0039b716c5 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/template/template-detail.manager.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/template/template-detail.manager.ts @@ -1,7 +1,7 @@ import { UmbMockEntityDetailManager } from '../utils/entity/entity-detail.manager.js'; import type { UmbEntityMockDbBase } from '../utils/entity/entity-base.js'; import { createTemplateScaffold, type UmbMockTemplateModel } from './template.data.js'; -import type { CreateTemplateRequestModel, TemplateResponseModel } from '@umbraco-cms/backoffice/backend-api'; +import type { CreateTemplateRequestModel, TemplateResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; import { UmbId } from '@umbraco-cms/backoffice/id'; export class UmbMockTemplateDetailManager extends UmbMockEntityDetailManager { diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/template/template.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/template/template.data.ts index b33ccfd47d..fd6988429a 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/template/template.data.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/template/template.data.ts @@ -4,8 +4,8 @@ import type { TemplateQuerySettingsResponseModel, TemplateQueryResultResponseModel, NamedEntityTreeItemResponseModel, -} from '@umbraco-cms/backoffice/backend-api'; -import { TemplateQueryPropertyTypeModel, OperatorModel } from '@umbraco-cms/backoffice/backend-api'; +} from '@umbraco-cms/backoffice/external/backend-api'; +import { TemplateQueryPropertyTypeModel, OperatorModel } from '@umbraco-cms/backoffice/external/backend-api'; type UmbMockTemplateModelHack = TemplateResponseModel & NamedEntityTreeItemResponseModel & TemplateItemResponseModel; diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/template/template.db.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/template/template.db.ts index f4833a87d1..e0394582b7 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/template/template.db.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/template/template.db.ts @@ -6,7 +6,7 @@ import type { UmbMockTemplateModel } from './template.data.js'; import { data } from './template.data.js'; import { UmbMockTemplateDetailManager } from './template-detail.manager.js'; import { UmbMockTemplateQueryManager } from './template-query.manager.js'; -import type { TemplateItemResponseModel } from '@umbraco-cms/backoffice/backend-api'; +import type { TemplateItemResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; class UmbTemplateMockDB extends UmbEntityMockDbBase { tree = new UmbMockEntityTreeManager(this, folderTreeItemMapper); diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/tracked-reference.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/tracked-reference.data.ts index df1df04c00..195999bc43 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/tracked-reference.data.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/tracked-reference.data.ts @@ -1,4 +1,4 @@ -import type { RelationItemResponseModel } from '@umbraco-cms/backoffice/backend-api'; +import type { RelationItemResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; export const items: Array = [ { diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/user-group/user-group.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/user-group/user-group.data.ts index e1644121f6..46986bd2d8 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/user-group/user-group.data.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/user-group/user-group.data.ts @@ -1,4 +1,4 @@ -import type { UserGroupItemResponseModel, UserGroupResponseModel } from '@umbraco-cms/backoffice/backend-api'; +import type { UserGroupItemResponseModel, UserGroupResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; import { UMB_USER_PERMISSION_DOCUMENT_CREATE, UMB_USER_PERMISSION_DOCUMENT_DELETE, diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/user-group/user-group.db.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/user-group/user-group.db.ts index 30e1cd9399..da149985fe 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/user-group/user-group.db.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/user-group/user-group.db.ts @@ -7,7 +7,7 @@ import type { CreateUserGroupRequestModel, UserGroupItemResponseModel, UserGroupResponseModel, -} from '@umbraco-cms/backoffice/backend-api'; +} from '@umbraco-cms/backoffice/external/backend-api'; import { UmbId } from '@umbraco-cms/backoffice/id'; export class UmbUserGroupMockDB extends UmbEntityMockDbBase { diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/user/user.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/user/user.data.ts index 58cc1f0c83..366b39c55a 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/user/user.data.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/user/user.data.ts @@ -1,5 +1,5 @@ -import type { UserItemResponseModel, UserResponseModel } from '@umbraco-cms/backoffice/backend-api'; -import { UserStateModel } from '@umbraco-cms/backoffice/backend-api'; +import type { UserItemResponseModel, UserResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { UserStateModel } from '@umbraco-cms/backoffice/external/backend-api'; export type UmbMockUserModel = UserResponseModel & UserItemResponseModel; diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/user/user.db.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/user/user.db.ts index 757ac65cdd..e12caf1687 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/user/user.db.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/user/user.db.ts @@ -14,8 +14,8 @@ import type { UpdateUserGroupsOnUserRequestModel, UserItemResponseModel, UserResponseModel, -} from '@umbraco-cms/backoffice/backend-api'; -import { UserStateModel } from '@umbraco-cms/backoffice/backend-api'; +} from '@umbraco-cms/backoffice/external/backend-api'; +import { UserStateModel } from '@umbraco-cms/backoffice/external/backend-api'; const userGroupFilter = (filterOptions: any, item: UmbMockUserModel) => arrayFilter(filterOptions.userGroupIds, item.userGroupIds); diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/utils.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/utils.ts index 3e46447f94..54e1eee8ff 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/utils.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/utils.ts @@ -2,7 +2,7 @@ import type { FolderTreeItemResponseModel, FileSystemTreeItemPresentationModel, NamedEntityTreeItemResponseModel, -} from '@umbraco-cms/backoffice/backend-api'; +} from '@umbraco-cms/backoffice/external/backend-api'; export const createEntityTreeItem = (item: any): NamedEntityTreeItemResponseModel => { return { diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/utils/entity/entity-folder.manager.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/utils/entity/entity-folder.manager.ts index 17c64ee2a8..65dfc08ecf 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/utils/entity/entity-folder.manager.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/utils/entity/entity-folder.manager.ts @@ -4,7 +4,7 @@ import type { FolderResponseModel, FolderTreeItemResponseModel, UpdateFolderResponseModel, -} from '@umbraco-cms/backoffice/backend-api'; +} from '@umbraco-cms/backoffice/external/backend-api'; export class UmbMockEntityFolderManager> { #db: UmbEntityMockDbBase; diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/utils/entity/entity-recycle-bin.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/utils/entity/entity-recycle-bin.ts index 5eefd81b76..fb6940cc7a 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/utils/entity/entity-recycle-bin.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/utils/entity/entity-recycle-bin.ts @@ -1,6 +1,6 @@ import { UmbEntityMockDbBase } from './entity-base.js'; import { UmbMockEntityTreeManager } from './entity-tree.manager.js'; -import type { ContentTreeItemResponseModel } from '@umbraco-cms/backoffice/backend-api'; +import type { ContentTreeItemResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; export class UmbEntityRecycleBin< MockType extends Omit, diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/utils/entity/entity-tree.manager.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/utils/entity/entity-tree.manager.ts index 02adbec8b0..3405a88309 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/utils/entity/entity-tree.manager.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/utils/entity/entity-tree.manager.ts @@ -1,6 +1,6 @@ import type { UmbEntityMockDbBase } from './entity-base.js'; import { UmbId } from '@umbraco-cms/backoffice/id'; -import type { EntityTreeItemResponseModel } from '@umbraco-cms/backoffice/backend-api'; +import type { EntityTreeItemResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; export class UmbMockEntityTreeManager> { #db: UmbEntityMockDbBase; diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/utils/file-system/file-system-base.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/utils/file-system/file-system-base.ts index 35617f24c3..15d9992ea5 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/utils/file-system/file-system-base.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/utils/file-system/file-system-base.ts @@ -1,5 +1,5 @@ import { UmbMockDBBase } from '../mock-db-base.js'; -import type { FileSystemResponseModelBaseModel } from '@umbraco-cms/backoffice/backend-api'; +import type { FileSystemResponseModelBaseModel } from '@umbraco-cms/backoffice/external/backend-api'; export abstract class UmbFileSystemMockDbBase< MockItemType extends FileSystemResponseModelBaseModel, diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/utils/file-system/file-system-detail.manager.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/utils/file-system/file-system-detail.manager.ts index d9c509814f..e18d6aacd8 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/utils/file-system/file-system-detail.manager.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/utils/file-system/file-system-detail.manager.ts @@ -4,7 +4,7 @@ import type { FileSystemFileResponseModelBaseModel, FileSystemFileUpdateRequestModelBaseModel, FileSystemResponseModelBaseModel, -} from '@umbraco-cms/backoffice/backend-api'; +} from '@umbraco-cms/backoffice/external/backend-api'; export class UmbMockFileSystemDetailManager { #db: UmbFileSystemMockDbBase; diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/utils/file-system/file-system-folder.manager.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/utils/file-system/file-system-folder.manager.ts index b0082c5210..b61ec4fe91 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/utils/file-system/file-system-folder.manager.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/utils/file-system/file-system-folder.manager.ts @@ -2,7 +2,7 @@ import type { UmbFileSystemMockDbBase } from './file-system-base.js'; import type { FileSystemCreateRequestModelBaseModel, FileSystemResponseModelBaseModel, -} from '@umbraco-cms/backoffice/backend-api'; +} from '@umbraco-cms/backoffice/external/backend-api'; export class UmbMockFileSystemFolderManager< MockItemType extends FileSystemResponseModelBaseModel & { isFolder: boolean }, diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/utils/file-system/file-system-item.manager.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/utils/file-system/file-system-item.manager.ts index 27f34c9693..0576c24737 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/utils/file-system/file-system-item.manager.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/utils/file-system/file-system-item.manager.ts @@ -1,5 +1,5 @@ import type { UmbMockDBBase } from '../mock-db-base.js'; -import type { FileSystemItemResponseModelBaseModel } from '@umbraco-cms/backoffice/backend-api'; +import type { FileSystemItemResponseModelBaseModel } from '@umbraco-cms/backoffice/external/backend-api'; export class UmbMockFileSystemItemManager { #db: UmbMockDBBase; diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/utils/file-system/file-system-tree.manager.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/utils/file-system/file-system-tree.manager.ts index 221c885621..05c243ce76 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/utils/file-system/file-system-tree.manager.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/utils/file-system/file-system-tree.manager.ts @@ -1,6 +1,6 @@ import type { UmbMockDBBase } from '../mock-db-base.js'; import { createFileSystemTreeItem } from '../../utils.js'; -import type { FileSystemTreeItemPresentationModel } from '@umbraco-cms/backoffice/backend-api'; +import type { FileSystemTreeItemPresentationModel } from '@umbraco-cms/backoffice/external/backend-api'; export class UmbMockFileSystemTreeManager> { #db: UmbMockDBBase; diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/audit-log.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/audit-log.handlers.ts index 9bfea26186..6091cfa4dd 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/audit-log.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/audit-log.handlers.ts @@ -4,7 +4,7 @@ import { umbracoPath } from '@umbraco-cms/backoffice/utils'; import type { PagedAuditLogResponseModel, PagedAuditLogWithUsernameResponseModel, -} from '@umbraco-cms/backoffice/backend-api'; +} from '@umbraco-cms/backoffice/external/backend-api'; export const handlers = [ rest.get(umbracoPath('/audit-log'), (_req, res, ctx) => { diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/data-type/copy.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/data-type/copy.handlers.ts index a8dccea109..e727fb91f6 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/data-type/copy.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/data-type/copy.handlers.ts @@ -1,7 +1,7 @@ const { rest } = window.MockServiceWorker; import { umbDataTypeMockDb } from '../../data/data-type/data-type.db.js'; import { UMB_SLUG } from './slug.js'; -import type { CopyDataTypeRequestModel } from '@umbraco-cms/backoffice/backend-api'; +import type { CopyDataTypeRequestModel } from '@umbraco-cms/backoffice/external/backend-api'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; export const copyHandlers = [ diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/data-type/detail.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/data-type/detail.handlers.ts index 3ae09b4602..025e33248c 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/data-type/detail.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/data-type/detail.handlers.ts @@ -1,7 +1,10 @@ const { rest } = window.MockServiceWorker; import { umbDataTypeMockDb } from '../../data/data-type/data-type.db.js'; import { UMB_SLUG } from './slug.js'; -import type { CreateDataTypeRequestModel, UpdateDataTypeRequestModel } from '@umbraco-cms/backoffice/backend-api'; +import type { + CreateDataTypeRequestModel, + UpdateDataTypeRequestModel, +} from '@umbraco-cms/backoffice/external/backend-api'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; export const detailHandlers = [ diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/data-type/move.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/data-type/move.handlers.ts index 7913d4057c..bca11683f4 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/data-type/move.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/data-type/move.handlers.ts @@ -1,7 +1,7 @@ const { rest } = window.MockServiceWorker; import { umbDataTypeMockDb } from '../../data/data-type/data-type.db.js'; import { UMB_SLUG } from './slug.js'; -import type { MoveDataTypeRequestModel } from '@umbraco-cms/backoffice/backend-api'; +import type { MoveDataTypeRequestModel } from '@umbraco-cms/backoffice/external/backend-api'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; export const moveHandlers = [ diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/dictionary/detail.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/dictionary/detail.handlers.ts index 5cd1711946..fcff5fefd7 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/dictionary/detail.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/dictionary/detail.handlers.ts @@ -5,7 +5,7 @@ import type { CreateDictionaryItemRequestModel, PagedDictionaryOverviewResponseModel, UpdateDictionaryItemRequestModel, -} from '@umbraco-cms/backoffice/backend-api'; +} from '@umbraco-cms/backoffice/external/backend-api'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; export const detailHandlers = [ diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/dictionary/upload.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/dictionary/upload.handlers.ts index e487e62ddf..d89c31e1f2 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/dictionary/upload.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/dictionary/upload.handlers.ts @@ -1,6 +1,6 @@ const { rest } = window.MockServiceWorker; import { UMB_SLUG } from './slug.js'; -import type { ImportDictionaryRequestModel } from '@umbraco-cms/backoffice/backend-api'; +import type { ImportDictionaryRequestModel } from '@umbraco-cms/backoffice/external/backend-api'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; const uploadResponse: ImportDictionaryRequestModel = { diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/document-type/detail.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/document-type/detail.handlers.ts index 6eee0e368a..9c8ace048d 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/document-type/detail.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/document-type/detail.handlers.ts @@ -1,7 +1,10 @@ const { rest } = window.MockServiceWorker; import { umbDocumentTypeMockDb } from '../../data/document-type/document-type.db.js'; import { UMB_SLUG } from './slug.js'; -import type { CreateMediaTypeRequestModel, UpdateMediaTypeRequestModel } from '@umbraco-cms/backoffice/backend-api'; +import type { + CreateMediaTypeRequestModel, + UpdateMediaTypeRequestModel, +} from '@umbraco-cms/backoffice/external/backend-api'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; export const detailHandlers = [ diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/document/detail.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/document/detail.handlers.ts index 6bfe569fe0..85e0ec9ccc 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/document/detail.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/document/detail.handlers.ts @@ -1,7 +1,10 @@ const { rest } = window.MockServiceWorker; import { umbDocumentMockDb } from '../../data/document/document.db.js'; import { UMB_SLUG } from './slug.js'; -import type { CreateDocumentRequestModel, UpdateDocumentRequestModel } from '@umbraco-cms/backoffice/backend-api'; +import type { + CreateDocumentRequestModel, + UpdateDocumentRequestModel, +} from '@umbraco-cms/backoffice/external/backend-api'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; export const detailHandlers = [ diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/document/publishing.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/document/publishing.handlers.ts index 52c498fc44..5678055cba 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/document/publishing.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/document/publishing.handlers.ts @@ -1,7 +1,10 @@ const { rest } = window.MockServiceWorker; import { umbDocumentMockDb } from '../../data/document/document.db.js'; import { UMB_SLUG } from './slug.js'; -import type { PublishDocumentRequestModel, UnpublishDocumentRequestModel } from '@umbraco-cms/backoffice/backend-api'; +import type { + PublishDocumentRequestModel, + UnpublishDocumentRequestModel, +} from '@umbraco-cms/backoffice/external/backend-api'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; export const publishingHandlers = [ diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/dynamic-root.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/dynamic-root.handlers.ts index c7c0072f06..052a905c02 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/dynamic-root.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/dynamic-root.handlers.ts @@ -1,5 +1,5 @@ import { umbDocumentMockDb } from '../data/document/document.db.js'; -import type { DynamicRootRequestModel } from '@umbraco-cms/backoffice/backend-api'; +import type { DynamicRootRequestModel } from '@umbraco-cms/backoffice/external/backend-api'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; const { rest } = window.MockServiceWorker; diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/examine-management.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/examine-management.handlers.ts index 7dc2891ae5..68d74955ab 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/examine-management.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/examine-management.handlers.ts @@ -7,7 +7,7 @@ import type { PagedIndexResponseModel, PagedSearcherResponseModel, PagedSearchResultResponseModel, -} from '@umbraco-cms/backoffice/backend-api'; +} from '@umbraco-cms/backoffice/external/backend-api'; export const handlers = [ rest.get(umbracoPath('/indexer'), (_req, res, ctx) => { diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/health-check.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/health-check.handlers.ts index 58018d5af2..1d5938ea8c 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/health-check.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/health-check.handlers.ts @@ -13,8 +13,8 @@ import type { HealthCheckGroupWithResultResponseModel, HealthCheckResultResponseModel, PagedHealthCheckGroupResponseModel, -} from '@umbraco-cms/backoffice/backend-api'; -import { StatusResultTypeModel } from '@umbraco-cms/backoffice/backend-api'; +} from '@umbraco-cms/backoffice/external/backend-api'; +import { StatusResultTypeModel } from '@umbraco-cms/backoffice/external/backend-api'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; export const handlers = [ diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/install.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/install.handlers.ts index 7323f09e02..20ee663300 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/install.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/install.handlers.ts @@ -4,8 +4,8 @@ import type { InstallSettingsResponseModel, ProblemDetails, InstallRequestModel, -} from '@umbraco-cms/backoffice/backend-api'; -import { TelemetryLevelModel } from '@umbraco-cms/backoffice/backend-api'; +} from '@umbraco-cms/backoffice/external/backend-api'; +import { TelemetryLevelModel } from '@umbraco-cms/backoffice/external/backend-api'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; export const handlers = [ diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/language/detail.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/language/detail.handlers.ts index a70997450b..667081e36c 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/language/detail.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/language/detail.handlers.ts @@ -1,7 +1,10 @@ const { rest } = window.MockServiceWorker; import { umbLanguageMockDb } from '../../data/language/language.db.js'; import { UMB_SLUG } from './slug.js'; -import type { CreateLanguageRequestModel, UpdateLanguageRequestModel } from '@umbraco-cms/backoffice/backend-api'; +import type { + CreateLanguageRequestModel, + UpdateLanguageRequestModel, +} from '@umbraco-cms/backoffice/external/backend-api'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; export const detailHandlers = [ diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/log-viewer.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/log-viewer.handlers.ts index 20a37687dc..7ed17a52f7 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/log-viewer.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/log-viewer.handlers.ts @@ -1,7 +1,7 @@ const { rest } = window.MockServiceWorker; import { umbLogViewerData } from '../data/log-viewer.data.js'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; -import type { SavedLogSearchRequestModel } from '@umbraco-cms/backoffice/backend-api'; +import type { SavedLogSearchRequestModel } from '@umbraco-cms/backoffice/external/backend-api'; export const handlers = [ //#region Searches diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/media-type/detail.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/media-type/detail.handlers.ts index 18ffd1b3f5..ab46534549 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/media-type/detail.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/media-type/detail.handlers.ts @@ -1,7 +1,10 @@ const { rest } = window.MockServiceWorker; import { umbMediaTypeMockDb } from '../../data/media-type/media-type.db.js'; import { UMB_SLUG } from './slug.js'; -import type { CreateMediaTypeRequestModel, UpdateMediaTypeRequestModel } from '@umbraco-cms/backoffice/backend-api'; +import type { + CreateMediaTypeRequestModel, + UpdateMediaTypeRequestModel, +} from '@umbraco-cms/backoffice/external/backend-api'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; export const detailHandlers = [ diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/media/detail.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/media/detail.handlers.ts index 83acb4e569..f2eb2098ef 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/media/detail.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/media/detail.handlers.ts @@ -1,7 +1,7 @@ const { rest } = window.MockServiceWorker; import { umbMediaMockDb } from '../../data/media/media.db.js'; import { UMB_SLUG } from './slug.js'; -import type { CreateMediaRequestModel, UpdateMediaRequestModel } from '@umbraco-cms/backoffice/backend-api'; +import type { CreateMediaRequestModel, UpdateMediaRequestModel } from '@umbraco-cms/backoffice/external/backend-api'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; export const detailHandlers = [ diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/modelsbuilder.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/modelsbuilder.handlers.ts index 4273f5f24f..a4a4e5157d 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/modelsbuilder.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/modelsbuilder.handlers.ts @@ -3,11 +3,9 @@ const { rest } = window.MockServiceWorker; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; import type { ModelsBuilderResponseModel, - OutOfDateStatusResponseModel} from '@umbraco-cms/backoffice/backend-api'; -import { - ModelsModeModel, - OutOfDateTypeModel, -} from '@umbraco-cms/backoffice/backend-api'; + OutOfDateStatusResponseModel, +} from '@umbraco-cms/backoffice/external/backend-api'; +import { ModelsModeModel, OutOfDateTypeModel } from '@umbraco-cms/backoffice/external/backend-api'; export const handlers = [ rest.post(umbracoPath('/models-builder/build'), async (_req, res, ctx) => { diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/package.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/package.handlers.ts index 25cb6cb123..c6df7095c8 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/package.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/package.handlers.ts @@ -7,7 +7,7 @@ import type { PagedPackageDefinitionResponseModel, PagedPackageMigrationStatusResponseModel, CreatePackageRequestModel, -} from '@umbraco-cms/backoffice/backend-api'; +} from '@umbraco-cms/backoffice/external/backend-api'; export const handlers = [ rest.get(umbracoPath('/package/migration-status'), (_req, res, ctx) => { diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/partial-view/detail.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/partial-view/detail.handlers.ts index f0ee2fb5b2..811f2f1a94 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/partial-view/detail.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/partial-view/detail.handlers.ts @@ -1,7 +1,10 @@ const { rest } = window.MockServiceWorker; import { umbPartialViewMockDB } from '../../data/partial-view/partial-view.db.js'; import { UMB_SLUG } from './slug.js'; -import type { CreateStylesheetRequestModel, UpdateStylesheetRequestModel } from '@umbraco-cms/backoffice/backend-api'; +import type { + CreateStylesheetRequestModel, + UpdateStylesheetRequestModel, +} from '@umbraco-cms/backoffice/external/backend-api'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; export const detailHandlers = [ diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/partial-view/folder.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/partial-view/folder.handlers.ts index 6c18bf61b8..f214cf7be0 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/partial-view/folder.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/partial-view/folder.handlers.ts @@ -1,7 +1,7 @@ const { rest } = window.MockServiceWorker; import { umbPartialViewMockDB } from '../../data/partial-view/partial-view.db.js'; import { UMB_SLUG } from './slug.js'; -import type { CreatePartialViewFolderRequestModel } from '@umbraco-cms/backoffice/backend-api'; +import type { CreatePartialViewFolderRequestModel } from '@umbraco-cms/backoffice/external/backend-api'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; export const folderHandlers = [ diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/partial-view/rename.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/partial-view/rename.handlers.ts index cfdd4f6559..61e3992f3d 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/partial-view/rename.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/partial-view/rename.handlers.ts @@ -1,7 +1,7 @@ const { rest } = window.MockServiceWorker; import { umbPartialViewMockDB } from '../../data/partial-view/partial-view.db.js'; import { UMB_SLUG } from './slug.js'; -import type { RenameStylesheetRequestModel } from '@umbraco-cms/backoffice/backend-api'; +import type { RenameStylesheetRequestModel } from '@umbraco-cms/backoffice/external/backend-api'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; export const renameHandlers = [ diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/performance-profiling.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/performance-profiling.handlers.ts index bca95cd837..07be7c9be8 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/performance-profiling.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/performance-profiling.handlers.ts @@ -1,7 +1,7 @@ const { rest } = window.MockServiceWorker; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; -import type { ProfilingStatusResponseModel } from '@umbraco-cms/backoffice/backend-api'; +import type { ProfilingStatusResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; export const handlers = [ rest.get(umbracoPath('/profiling/status'), (_req, res, ctx) => { diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/redirect-management.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/redirect-management.handlers.ts index 6ac313cc0c..b50d812f26 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/redirect-management.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/redirect-management.handlers.ts @@ -4,8 +4,8 @@ import type { PagedRedirectUrlResponseModel, RedirectUrlResponseModel, RedirectUrlStatusResponseModel, -} from '@umbraco-cms/backoffice/backend-api'; -import { RedirectStatusModel } from '@umbraco-cms/backoffice/backend-api'; +} from '@umbraco-cms/backoffice/external/backend-api'; +import { RedirectStatusModel } from '@umbraco-cms/backoffice/external/backend-api'; export const handlers = [ rest.get(umbracoPath('/redirect-management'), (_req, res, ctx) => { diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/script/detail.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/script/detail.handlers.ts index fd1a646ab5..2868cf8c14 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/script/detail.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/script/detail.handlers.ts @@ -1,7 +1,10 @@ const { rest } = window.MockServiceWorker; import { umbScriptMockDb } from '../../data/script/script.db.js'; import { UMB_SLUG } from './slug.js'; -import type { CreateStylesheetRequestModel, UpdateStylesheetRequestModel } from '@umbraco-cms/backoffice/backend-api'; +import type { + CreateStylesheetRequestModel, + UpdateStylesheetRequestModel, +} from '@umbraco-cms/backoffice/external/backend-api'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; export const detailHandlers = [ diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/script/folder.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/script/folder.handlers.ts index 462afcb94e..1a310e8d3b 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/script/folder.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/script/folder.handlers.ts @@ -1,7 +1,7 @@ const { rest } = window.MockServiceWorker; import { umbScriptMockDb } from '../../data/script/script.db.js'; import { UMB_SLUG } from './slug.js'; -import type { CreateScriptFolderRequestModel } from '@umbraco-cms/backoffice/backend-api'; +import type { CreateScriptFolderRequestModel } from '@umbraco-cms/backoffice/external/backend-api'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; export const folderHandlers = [ diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/script/rename.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/script/rename.handlers.ts index 7c9dfaf39d..fbb3abec2b 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/script/rename.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/script/rename.handlers.ts @@ -1,7 +1,7 @@ const { rest } = window.MockServiceWorker; import { umbScriptMockDb } from '../../data/script/script.db.js'; import { UMB_SLUG } from './slug.js'; -import type { RenameStylesheetRequestModel } from '@umbraco-cms/backoffice/backend-api'; +import type { RenameStylesheetRequestModel } from '@umbraco-cms/backoffice/external/backend-api'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; export const renameHandlers = [ diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/server.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/server.handlers.ts index 9b5c182fff..2be9975a71 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/server.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/server.handlers.ts @@ -1,11 +1,9 @@ const { rest } = window.MockServiceWorker; import type { ServerStatusResponseModel, - ServerInformationResponseModel} from '@umbraco-cms/backoffice/backend-api'; -import { - RuntimeLevelModel, - RuntimeModeModel -} from '@umbraco-cms/backoffice/backend-api'; + ServerInformationResponseModel, +} from '@umbraco-cms/backoffice/external/backend-api'; +import { RuntimeLevelModel, RuntimeModeModel } from '@umbraco-cms/backoffice/external/backend-api'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; export const serverRunningHandler = rest.get(umbracoPath('/server/status'), (_req, res, ctx) => { diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/stylesheet/detail.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/stylesheet/detail.handlers.ts index 0ea95bf4e8..74bc982761 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/stylesheet/detail.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/stylesheet/detail.handlers.ts @@ -1,7 +1,10 @@ const { rest } = window.MockServiceWorker; import { umbStylesheetMockDb } from '../../data/stylesheet/stylesheet.db.js'; import { UMB_SLUG } from './slug.js'; -import type { CreateStylesheetRequestModel, UpdateStylesheetRequestModel } from '@umbraco-cms/backoffice/backend-api'; +import type { + CreateStylesheetRequestModel, + UpdateStylesheetRequestModel, +} from '@umbraco-cms/backoffice/external/backend-api'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; export const detailHandlers = [ diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/stylesheet/folder.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/stylesheet/folder.handlers.ts index b4cb67bdfc..a4dcc2f43b 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/stylesheet/folder.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/stylesheet/folder.handlers.ts @@ -1,7 +1,7 @@ const { rest } = window.MockServiceWorker; import { umbStylesheetMockDb } from '../../data/stylesheet/stylesheet.db.js'; import { UMB_SLUG } from './slug.js'; -import type { CreateStylesheetFolderRequestModel } from '@umbraco-cms/backoffice/backend-api'; +import type { CreateStylesheetFolderRequestModel } from '@umbraco-cms/backoffice/external/backend-api'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; export const folderHandlers = [ diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/stylesheet/rename.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/stylesheet/rename.handlers.ts index f20fb86832..3755eb996f 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/stylesheet/rename.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/stylesheet/rename.handlers.ts @@ -1,7 +1,7 @@ const { rest } = window.MockServiceWorker; import { umbStylesheetMockDb } from '../../data/stylesheet/stylesheet.db.js'; import { UMB_SLUG } from './slug.js'; -import type { RenameStylesheetRequestModel } from '@umbraco-cms/backoffice/backend-api'; +import type { RenameStylesheetRequestModel } from '@umbraco-cms/backoffice/external/backend-api'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; export const renameHandlers = [ diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/tag-handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/tag-handlers.ts index d99de8bef5..2732de88ba 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/tag-handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/tag-handlers.ts @@ -1,6 +1,6 @@ const { rest } = window.MockServiceWorker; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; -import type { PagedTagResponseModel, TagResponseModel } from '@umbraco-cms/backoffice/backend-api'; +import type { PagedTagResponseModel, TagResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; export const handlers = [ rest.get(umbracoPath('/tag'), (_req, res, ctx) => { diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/telemetry.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/telemetry.handlers.ts index 0bcb4e5cfb..efcf9451be 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/telemetry.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/telemetry.handlers.ts @@ -1,12 +1,8 @@ const { rest } = window.MockServiceWorker; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; -import type { - PagedTelemetryResponseModel, - TelemetryResponseModel} from '@umbraco-cms/backoffice/backend-api'; -import { - TelemetryLevelModel, -} from '@umbraco-cms/backoffice/backend-api'; +import type { PagedTelemetryResponseModel, TelemetryResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { TelemetryLevelModel } from '@umbraco-cms/backoffice/external/backend-api'; let telemetryLevel = TelemetryLevelModel.BASIC; diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/template/detail.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/template/detail.handlers.ts index 7e92a2e20b..eda0f749b1 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/template/detail.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/template/detail.handlers.ts @@ -1,7 +1,10 @@ const { rest } = window.MockServiceWorker; import { umbTemplateMockDb } from '../../data/template/template.db.js'; import { UMB_SLUG } from './slug.js'; -import type { CreateTemplateRequestModel, UpdateTemplateRequestModel } from '@umbraco-cms/backoffice/backend-api'; +import type { + CreateTemplateRequestModel, + UpdateTemplateRequestModel, +} from '@umbraco-cms/backoffice/external/backend-api'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; export const detailHandlers = [ diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/tracked-reference.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/tracked-reference.handlers.ts index 50cc66b1f0..8c07ee88e4 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/tracked-reference.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/tracked-reference.handlers.ts @@ -1,7 +1,7 @@ import { items } from '../data/tracked-reference.data.js'; const { rest } = window.MockServiceWorker; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; -import type { PagedRelationItemResponseModel } from '@umbraco-cms/backoffice/backend-api'; +import type { PagedRelationItemResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; export const handlers = [ rest.get(umbracoPath('/tracked-reference/:id'), (_req, res, ctx) => { diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/upgrade.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/upgrade.handlers.ts index 500880e3df..a7050fe08c 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/upgrade.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/upgrade.handlers.ts @@ -1,7 +1,7 @@ const { rest } = window.MockServiceWorker; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; -import type { UpgradeSettingsResponseModel } from '@umbraco-cms/backoffice/backend-api'; +import type { UpgradeSettingsResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; export const handlers = [ rest.get(umbracoPath('/upgrade/settings'), (_req, res, ctx) => { diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/user-group/detail.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/user-group/detail.handlers.ts index 5fbc13554e..181fd2cbfc 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/user-group/detail.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/user-group/detail.handlers.ts @@ -1,7 +1,10 @@ const { rest } = window.MockServiceWorker; import { umbUserGroupMockDb } from '../../data/user-group/user-group.db.js'; import { UMB_SLUG } from './slug.js'; -import type { CreateUserGroupRequestModel, UpdateUserGroupRequestModel } from '@umbraco-cms/backoffice/backend-api'; +import type { + CreateUserGroupRequestModel, + UpdateUserGroupRequestModel, +} from '@umbraco-cms/backoffice/external/backend-api'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; export const detailHandlers = [ diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/user/change-password.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/user/change-password.handlers.ts index dcdcd307a8..08bd614829 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/user/change-password.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/user/change-password.handlers.ts @@ -1,6 +1,6 @@ const { rest } = window.MockServiceWorker; import { UMB_SLUG } from './slug.js'; -import type { ChangePasswordUserRequestModel } from '@umbraco-cms/backoffice/backend-api'; +import type { ChangePasswordUserRequestModel } from '@umbraco-cms/backoffice/external/backend-api'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; export const handlers = [ diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/user/detail.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/user/detail.handlers.ts index ba2fbdb49b..675f37a0b3 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/user/detail.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/user/detail.handlers.ts @@ -1,7 +1,7 @@ const { rest } = window.MockServiceWorker; import { umbUserMockDb } from '../../data/user/user.db.js'; import { UMB_SLUG } from './slug.js'; -import type { CreateUserRequestModel, UpdateUserRequestModel } from '@umbraco-cms/backoffice/backend-api'; +import type { CreateUserRequestModel, UpdateUserRequestModel } from '@umbraco-cms/backoffice/external/backend-api'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; export const detailHandlers = [ diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/user/disable.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/user/disable.handlers.ts index 1da2fee2c9..833dd3040c 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/user/disable.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/user/disable.handlers.ts @@ -1,7 +1,7 @@ const { rest } = window.MockServiceWorker; import { umbUserMockDb } from '../../data/user/user.db.js'; import { UMB_SLUG } from './slug.js'; -import type { DisableUserRequestModel } from '@umbraco-cms/backoffice/backend-api'; +import type { DisableUserRequestModel } from '@umbraco-cms/backoffice/external/backend-api'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; export const handlers = [ diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/user/enable.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/user/enable.handlers.ts index 74f84990df..202003c5f8 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/user/enable.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/user/enable.handlers.ts @@ -1,7 +1,7 @@ const { rest } = window.MockServiceWorker; import { umbUserMockDb } from '../../data/user/user.db.js'; import { UMB_SLUG } from './slug.js'; -import type { EnableUserRequestModel } from '@umbraco-cms/backoffice/backend-api'; +import type { EnableUserRequestModel } from '@umbraco-cms/backoffice/external/backend-api'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; export const handlers = [ diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/user/invite.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/user/invite.handlers.ts index 074c0e416c..063d9f2c36 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/user/invite.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/user/invite.handlers.ts @@ -1,7 +1,7 @@ const { rest } = window.MockServiceWorker; import { umbUserMockDb } from '../../data/user/user.db.js'; import { UMB_SLUG } from './slug.js'; -import type { InviteUserRequestModel } from '@umbraco-cms/backoffice/backend-api'; +import type { InviteUserRequestModel } from '@umbraco-cms/backoffice/external/backend-api'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; const inviteSlug = `${UMB_SLUG}/invite`; diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/user/unlock.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/user/unlock.handlers.ts index 24abc83e47..b310df3830 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/user/unlock.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/user/unlock.handlers.ts @@ -1,7 +1,7 @@ const { rest } = window.MockServiceWorker; import { umbUserMockDb } from '../../data/user/user.db.js'; import { UMB_SLUG } from './slug.js'; -import type { UnlockUsersRequestModel } from '@umbraco-cms/backoffice/backend-api'; +import type { UnlockUsersRequestModel } from '@umbraco-cms/backoffice/external/backend-api'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; export const handlers = [ diff --git a/src/Umbraco.Web.UI.Client/src/packages/audit-log/repository/audit-log.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/audit-log/repository/audit-log.repository.ts index 8077800026..71117902ba 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/audit-log/repository/audit-log.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/audit-log/repository/audit-log.repository.ts @@ -1,9 +1,9 @@ import { UmbAuditLogServerDataSource } from './audit-log.server.data.js'; import { UmbContextConsumerController } from '@umbraco-cms/backoffice/context-api'; import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api'; -import type { UmbNotificationContext} from '@umbraco-cms/backoffice/notification'; +import type { UmbNotificationContext } from '@umbraco-cms/backoffice/notification'; import { UMB_NOTIFICATION_CONTEXT } from '@umbraco-cms/backoffice/notification'; -import type { AuditTypeModel, DirectionModel } from '@umbraco-cms/backoffice/backend-api'; +import type { AuditTypeModel, DirectionModel } from '@umbraco-cms/backoffice/external/backend-api'; import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; export class UmbAuditLogRepository extends UmbBaseController { diff --git a/src/Umbraco.Web.UI.Client/src/packages/audit-log/repository/audit-log.server.data.ts b/src/Umbraco.Web.UI.Client/src/packages/audit-log/repository/audit-log.server.data.ts index 4bd800ac9b..e3e365046f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/audit-log/repository/audit-log.server.data.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/audit-log/repository/audit-log.server.data.ts @@ -1,5 +1,5 @@ -import type { DirectionModel, AuditTypeModel } from '@umbraco-cms/backoffice/backend-api'; -import { AuditLogResource } from '@umbraco-cms/backoffice/backend-api'; +import type { DirectionModel, AuditTypeModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { AuditLogResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-areas-container/block-grid-areas-container.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-areas-container/block-grid-areas-container.element.ts new file mode 100644 index 0000000000..9abdd14f22 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-areas-container/block-grid-areas-container.element.ts @@ -0,0 +1,56 @@ +import { UMB_BLOCK_GRID_ENTRY_CONTEXT, type UmbBlockGridLayoutAreaItemModel } from '@umbraco-cms/backoffice/block'; +import { css, customElement, html, repeat, state } from '@umbraco-cms/backoffice/external/lit'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; +import '../block-grid-entries/index.js'; + +/** + * @element umb-block-grid-area-container + */ +@customElement('umb-block-grid-area-container') +export class UmbBlockGridAreaContainerElement extends UmbLitElement { + // + + @state() + _areas?: Array = []; + + constructor() { + super(); + + this.consumeContext(UMB_BLOCK_GRID_ENTRY_CONTEXT, (context) => { + this.observe( + context.areas, + (areas) => { + this._areas = areas; + }, + 'observeAreas', + ); + }); + } + + render() { + return this._areas + ? repeat( + this._areas, + (area) => area.key, + (area) => html` `, + ) + : ''; + } + + static styles = [ + css` + :host { + display: block; + width: 100%; + } + `, + ]; +} + +export default UmbBlockGridAreaContainerElement; + +declare global { + interface HTMLElementTagNameMap { + 'umb-block-grid-area-container': UmbBlockGridAreaContainerElement; + } +} diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-areas-container/index.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-areas-container/index.ts new file mode 100644 index 0000000000..72d5cd24dc --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-areas-container/index.ts @@ -0,0 +1 @@ +export * from './block-grid-areas-container.element.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-entries/block-grid-entries.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-entries/block-grid-entries.element.ts new file mode 100644 index 0000000000..1e5f17347f --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-entries/block-grid-entries.element.ts @@ -0,0 +1,119 @@ +import { UmbBlockGridEntriesContext } from '../../context/block-grid-entries.context.js'; +import type { UmbBlockGridEntryElement } from '../block-grid-entry/index.js'; +import type { UmbBlockGridLayoutModel } from '@umbraco-cms/backoffice/block'; +import { html, customElement, state, repeat, css, property } from '@umbraco-cms/backoffice/external/lit'; +import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; +import '../block-grid-entry/index.js'; +import { UmbSorterController, type UmbSorterConfig } from '@umbraco-cms/backoffice/sorter'; + +const SORTER_CONFIG: UmbSorterConfig = { + getUniqueOfElement: (element) => { + return element.contentUdi!; + }, + getUniqueOfModel: (modelEntry) => { + return modelEntry.contentUdi; + }, + identifier: 'block-grid-editor', + itemSelector: 'umb-block-grid-entry', + //containerSelector: 'EMPTY ON PURPOSE, SO IT BECOMES THE HOST ELEMENT', +}; + +/** + * @element umb-block-grid-entries + */ +@customElement('umb-block-grid-entries') +export class UmbBlockGridEntriesElement extends UmbLitElement { + // + // TODO: Make sure Sorter callbacks handles columnSpan when retrieving a new entry. + + // + #sorter = new UmbSorterController(this, { + ...SORTER_CONFIG, + onChange: ({ model }) => { + this.#context.setLayouts(model); + }, + }); + + #context = new UmbBlockGridEntriesContext(this); + + @property({ attribute: false }) + public set areaKey(value: string | null) { + this.#context.setAreaKey(value); + } + public get areaKey(): string | null { + return null; // Not implemented. + } + + @state() + private _layoutEntries: Array = []; + + @state() + private _createButtonLabel = this.localize.term('blockEditor_addBlock'); + + constructor() { + super(); + this.observe(this.#context.layoutEntries, (layoutEntries) => { + const oldValue = this._layoutEntries; + this._layoutEntries = layoutEntries; + this.#sorter.setModel(layoutEntries); + this.requestUpdate('layoutEntries', oldValue); + }); + } + + render() { + // TODO: Missing ability to jump directly to creating a Block, when there is only one Block Type. + return html`${repeat( + this._layoutEntries, + (x) => x.contentUdi, + (layoutEntry, index) => + html` + + `, + )} + + + + + + `; + // + } + + static styles = [ + UmbTextStyles, + css` + :host { + display: grid; + gap: 1px; + } + > div { + display: flex; + flex-direction: column; + align-items: stretch; + } + + uui-button-group { + padding-top: 1px; + display: grid; + grid-template-columns: 1fr auto; + } + `, + ]; +} + +export default UmbBlockGridEntriesElement; + +declare global { + interface HTMLElementTagNameMap { + 'umb-block-grid-entries': UmbBlockGridEntriesElement; + } +} diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-entries/index.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-entries/index.ts new file mode 100644 index 0000000000..1ccc1acaa8 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-entries/index.ts @@ -0,0 +1 @@ +export * from './block-grid-entries.element.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-entry/block-grid-entry.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-entry/block-grid-entry.element.ts new file mode 100644 index 0000000000..be592ac409 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-entry/block-grid-entry.element.ts @@ -0,0 +1,119 @@ +import { UmbBlockGridEntryContext } from '../../context/block-grid-entry.context.js'; +import { html, css, customElement, property, state } from '@umbraco-cms/backoffice/external/lit'; +import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; +import '../ref-grid-block/index.js'; + +/** + * @element umb-block-grid-entry + */ +@customElement('umb-block-grid-entry') +export class UmbBlockGridEntryElement extends UmbLitElement implements UmbPropertyEditorUiElement { + // + @property({ attribute: false }) + public get contentUdi(): string | undefined { + return this._contentUdi; + } + public set contentUdi(value: string | undefined) { + if (!value) return; + this._contentUdi = value; + this.#context.setContentUdi(value); + } + private _contentUdi?: string | undefined; + // + + #context = new UmbBlockGridEntryContext(this); + + @state() + _hasSettings = false; + + @state() + _label = ''; + + @state() + _workspaceEditPath?: string; + + @state() + _inlineEditingMode?: boolean; + + // TODO: Move type for the Block Properties, and use it on the Element Interface for the Manifest. + @state() + _blockViewProps: { + label?: string; + } = {}; + + constructor() { + super(); + + this.observe(this.#context.workspaceEditPath, (workspaceEditPath) => { + this._workspaceEditPath = workspaceEditPath; + }); + this.observe(this.#context.blockTypeSettingsElementTypeKey, (blockTypeSettingsElementTypeKey) => { + this._hasSettings = !!blockTypeSettingsElementTypeKey; + }); + this.observe(this.#context.label, (label) => { + this._blockViewProps.label = label; + this._label = label; + }); + } + + #renderRefBlock() { + return html``; + } + + #renderBlock() { + return html` + ${this.#renderRefBlock()} + + ${this._workspaceEditPath + ? html` + + ` + : ''} + ${this._workspaceEditPath && this._hasSettings + ? html` + + ` + : ''} + this.#context.requestDelete()}> + + + + `; + } + + render() { + return this.#renderBlock(); + } + + static styles = [ + css` + :host { + position: relative; + display: block; + } + uui-action-bar { + position: absolute; + top: var(--uui-size-2); + right: var(--uui-size-2); + } + + :host([drag-placeholder]) { + opacity: 0.2; + } + `, + ]; +} + +export default UmbBlockGridEntryElement; + +declare global { + interface HTMLElementTagNameMap { + 'umb-block-grid-entry': UmbBlockGridEntryElement; + } +} diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-entry/index.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-entry/index.ts new file mode 100644 index 0000000000..4b7b635ce7 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-entry/index.ts @@ -0,0 +1 @@ +export * from './block-grid-entry.element.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/index.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/index.ts new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/ref-grid-block/index.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/ref-grid-block/index.ts new file mode 100644 index 0000000000..192623405a --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/ref-grid-block/index.ts @@ -0,0 +1 @@ +export * from './ref-grid-block.element.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/ref-grid-block/ref-grid-block.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/ref-grid-block/ref-grid-block.element.ts new file mode 100644 index 0000000000..e2114d7140 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/ref-grid-block/ref-grid-block.element.ts @@ -0,0 +1,54 @@ +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; +import { UMB_BLOCK_ENTRY_CONTEXT } from '@umbraco-cms/backoffice/block'; +import { css, customElement, html, property, state } from '@umbraco-cms/backoffice/external/lit'; +import '../block-grid-areas-container/index.js'; + +/** + * @element umb-ref-grid-block + */ +@customElement('umb-ref-grid-block') +export class UmbRefGridBlockElement extends UmbLitElement { + // + @property({ type: String }) + label?: string; + + @state() + _workspaceEditPath?: string; + + constructor() { + super(); + + this.consumeContext(UMB_BLOCK_ENTRY_CONTEXT, (context) => { + this.observe( + context.workspaceEditPath, + (workspaceEditPath) => { + this._workspaceEditPath = workspaceEditPath; + }, + 'observeWorkspaceEditPath', + ); + }); + } + + render() { + // href=${this._workspaceEditPath ?? '#'} + return html` + + `; + } + + static styles = [ + css` + uui-ref-node { + min-height: var(--uui-size-16); + } + `, + ]; +} + +export default UmbRefGridBlockElement; + +declare global { + interface HTMLElementTagNameMap { + 'umb-ref-grid-block': UmbRefGridBlockElement; + } +} diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/context/block-grid-entries.context-token.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/context/block-grid-entries.context-token.ts new file mode 100644 index 0000000000..6b05007c46 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/context/block-grid-entries.context-token.ts @@ -0,0 +1,5 @@ +import type { UmbBlockGridEntriesContext } from './block-grid-entries.context.js'; +import { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; + +// TODO: Make discriminator method for this: +export const UMB_BLOCK_GRID_ENTRIES_CONTEXT = new UmbContextToken('UmbBlockEntriesContext'); diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/context/block-grid-entries.context.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/context/block-grid-entries.context.ts new file mode 100644 index 0000000000..9d841d3e29 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/context/block-grid-entries.context.ts @@ -0,0 +1,184 @@ +import type { UmbBlockDataType } from '../../block/index.js'; +import { UMB_BLOCK_CATALOGUE_MODAL, UmbBlockEntriesContext } from '../../block/index.js'; +import { UMB_BLOCK_GRID_ENTRY_CONTEXT, type UmbBlockGridWorkspaceData } from '../index.js'; +import type { UmbBlockGridLayoutModel, UmbBlockGridTypeModel } from '../types.js'; +import { UMB_BLOCK_GRID_MANAGER_CONTEXT } from './block-grid-manager.context.js'; +import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; +import { type UmbModalRouteBuilder, UmbModalRouteRegistrationController } from '@umbraco-cms/backoffice/modal'; + +export class UmbBlockGridEntriesContext extends UmbBlockEntriesContext< + typeof UMB_BLOCK_GRID_MANAGER_CONTEXT, + typeof UMB_BLOCK_GRID_MANAGER_CONTEXT.TYPE, + UmbBlockGridTypeModel, + UmbBlockGridLayoutModel +> { + // + #catalogueModal: UmbModalRouteRegistrationController; + #catalogueRouteBuilder?: UmbModalRouteBuilder; + + #parentEntry?: typeof UMB_BLOCK_GRID_ENTRY_CONTEXT.TYPE; + #retrieveParentEntry; + + //#parentUnique?: string; + #areaKey?: string | null; + + setParentUnique(contentUdi: string | null) { + this._workspaceModal.setUniquePathValue('parentUnique', contentUdi ?? 'null'); + this.#catalogueModal.setUniquePathValue('parentUnique', contentUdi ?? 'null'); + } + + setAreaKey(areaKey: string | null) { + this.#areaKey = areaKey; + this._workspaceModal.setUniquePathValue('areaKey', areaKey ?? 'null'); + this.#catalogueModal.setUniquePathValue('areaKey', areaKey ?? 'null'); + this.#gotAreaKey(); + } + + constructor(host: UmbControllerHost) { + super(host, UMB_BLOCK_GRID_MANAGER_CONTEXT); + + this._workspaceModal.addUniquePaths(['parentUnique', 'areaKey']); + + this.#retrieveParentEntry = this.consumeContext(UMB_BLOCK_GRID_ENTRY_CONTEXT, (blockGridEntry) => { + this.#parentEntry = blockGridEntry; + //this.#gotBlockParentEntry();// is not used at this point. + }).asPromise(); + + this.#catalogueModal = new UmbModalRouteRegistrationController(this, UMB_BLOCK_CATALOGUE_MODAL) + .addUniquePaths(['propertyAlias', 'variantId', 'parentUnique', 'areaKey']) + .addAdditionalPath(':view/:index') + .onSetup((routingInfo) => { + // Idea: Maybe on setup should be async, so it can retrieve the values when needed? [NL] + const index = routingInfo.index ? parseInt(routingInfo.index) : -1; + return { + data: { + blocks: [], + blockGroups: [], + openClipboard: routingInfo.view === 'clipboard', + blockOriginData: { index: index }, + }, + }; + }) + .observeRouteBuilder((routeBuilder) => { + this.#catalogueRouteBuilder = routeBuilder; + // TODO: Trigger render update? + }); + } + + protected _gotBlockManager() { + if (!this._manager) return; + + this.observe( + this._manager.propertyAlias, + (alias) => { + this.#catalogueModal.setUniquePathValue('propertyAlias', alias ?? 'null'); + }, + 'observePropertyAlias', + ); + + this.observe( + this._manager.variantId, + (variantId) => { + if (variantId) { + this.#catalogueModal.setUniquePathValue('variantId', variantId.toString()); + } + }, + 'observePropertyAlias', + ); + } + + /*#gotBlockParentEntry() { + if (!this.#parentEntry) return; + }*/ + + async #gotAreaKey() { + if (this.#areaKey === undefined) return; + + if (this.#areaKey === null) { + // Root entries: + await this._retrieveManager; + if (!this._manager) return; + + this.setParentUnique(null); + this.observe( + this._manager.layouts, + (layouts) => { + this._layoutEntries.setValue(layouts); + }, + 'observeParentLayouts', + ); + this.observe( + this.layoutEntries, + (layouts) => { + this._manager?.setLayouts(layouts); + }, + 'observeThisLayouts', + ); + } else { + // entries of a area: + await this.#retrieveParentEntry; + if (!this.#parentEntry) return; + + this.observe( + this.#parentEntry.unique, + (unique) => { + this.setParentUnique(unique ?? null); + }, + 'observeParentUnique', + ); + this.observe( + this.#parentEntry.layoutsOfArea(this.#areaKey), + (layouts) => { + this._layoutEntries.setValue(layouts); + }, + 'observeParentLayouts', + ); + + this.observe( + this.layoutEntries, + (layouts) => { + if (this.#areaKey) { + this.#parentEntry?.setLayoutsOfArea(this.#areaKey, layouts); + } + }, + 'observeThisLayouts', + ); + } + } + + getPathForCreateBlock(index: number) { + return this.#catalogueRouteBuilder?.({ view: 'create', index: index }); + } + + getPathForClipboard(index: number) { + return this.#catalogueRouteBuilder?.({ view: 'clipboard', index: index }); + } + + async create( + contentElementTypeKey: string, + partialLayoutEntry?: Omit, + modalData?: UmbBlockGridWorkspaceData, + ) { + await this._retrieveManager; + return this._manager?.create(contentElementTypeKey, partialLayoutEntry, modalData); + } + + // insert Block? + + async insert( + layoutEntry: UmbBlockGridLayoutModel, + content: UmbBlockDataType, + settings: UmbBlockDataType | undefined, + modalData: UmbBlockGridWorkspaceData, + ) { + await this._retrieveManager; + // TODO: Insert layout entry at the right spot. + return this._manager?.insert(layoutEntry, content, settings, modalData) ?? false; + } + + // create Block? + async delete(contentUdi: string) { + // TODO: Loop through children and delete them as well? + await super.delete(contentUdi); + } +} diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/context/block-grid-entry.context-token.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/context/block-grid-entry.context-token.ts new file mode 100644 index 0000000000..b5213a3c32 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/context/block-grid-entry.context-token.ts @@ -0,0 +1,5 @@ +import type { UmbBlockGridEntryContext } from './block-grid-entry.context.js'; +import { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; + +// TODO: Make discriminator method for this: +export const UMB_BLOCK_GRID_ENTRY_CONTEXT = new UmbContextToken('UmbBlockEntryContext'); diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/context/block-grid-entry.context.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/context/block-grid-entry.context.ts new file mode 100644 index 0000000000..74d58a6a11 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/context/block-grid-entry.context.ts @@ -0,0 +1,57 @@ +import { UMB_BLOCK_GRID_MANAGER_CONTEXT } from './block-grid-manager.context.js'; +import { UMB_BLOCK_GRID_ENTRIES_CONTEXT } from './block-grid-entries.context-token.js'; +import { + UmbBlockEntryContext, + type UmbBlockGridTypeModel, + type UmbBlockGridLayoutModel, +} from '@umbraco-cms/backoffice/block'; +import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; +import { appendToFrozenArray } from '@umbraco-cms/backoffice/observable-api'; +export class UmbBlockGridEntryContext extends UmbBlockEntryContext< + typeof UMB_BLOCK_GRID_MANAGER_CONTEXT, + typeof UMB_BLOCK_GRID_MANAGER_CONTEXT.TYPE, + typeof UMB_BLOCK_GRID_ENTRIES_CONTEXT, + typeof UMB_BLOCK_GRID_ENTRIES_CONTEXT.TYPE, + UmbBlockGridTypeModel, + UmbBlockGridLayoutModel +> { + areas = this._layout.asObservablePart((x) => x?.areas ?? []); + + constructor(host: UmbControllerHost) { + super(host, UMB_BLOCK_GRID_MANAGER_CONTEXT, UMB_BLOCK_GRID_ENTRIES_CONTEXT); + } + + layoutsOfArea(areaKey: string) { + return this._layout.asObservablePart((x) => x?.areas.find((x) => x.key === areaKey)?.items ?? []); + } + + setLayoutsOfArea(areaKey: string, layouts: UmbBlockGridLayoutModel[]) { + const frozenValue = this._layout.value; + if (!frozenValue) return; + const areas = appendToFrozenArray( + frozenValue?.areas, + { + key: areaKey, + items: layouts, + }, + (x) => x.key, + ); + this._layout.update({ areas }); + } + + _gotManager() { + if (this._manager) { + /*this.observe( + this._manager.inlineEditingMode, + (inlineEditingMode) => { + this.#inlineEditingMode.setValue(inlineEditingMode); + }, + 'observeInlineEditingMode', + );*/ + } else { + //this.removeControllerByAlias('observeInlineEditingMode'); + } + } + + _gotEntries() {} +} diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/context/block-grid-manager.context.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/context/block-grid-manager.context.ts new file mode 100644 index 0000000000..95a400db24 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/context/block-grid-manager.context.ts @@ -0,0 +1,53 @@ +import type { UmbBlockGridLayoutModel, UmbBlockGridTypeModel } from '../types.js'; +import { UmbBlockManagerContext } from '../../block/context/block-manager.context.js'; +import type { UmbBlockGridWorkspaceData } from '../index.js'; +import type { UmbBlockTypeGroup } from '../../block-type/types.js'; +import type { UmbBlockDataType } from '../../block/types.js'; +import { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; +import { UmbArrayState } from '@umbraco-cms/backoffice/observable-api'; + +/** + * A implementation of the Block Manager specifically for the Block Grid Editor. + */ +export class UmbBlockGridManagerContext< + BlockLayoutType extends UmbBlockGridLayoutModel = UmbBlockGridLayoutModel, +> extends UmbBlockManagerContext { + // + // + #blockGroups = new UmbArrayState(>[], (x) => x.key); + public readonly blockGroups = this.#blockGroups.asObservable(); + + setBlockGroups(blockGroups: Array) { + this.#blockGroups.setValue(blockGroups); + } + getBlockGroups() { + return this.#blockGroups.value; + } + + create( + contentElementTypeKey: string, + partialLayoutEntry?: Omit, + modalData?: UmbBlockGridWorkspaceData, + ) { + return super.createBlockData(contentElementTypeKey, partialLayoutEntry); + } + + insert( + layoutEntry: BlockLayoutType, + content: UmbBlockDataType, + settings: UmbBlockDataType | undefined, + modalData: UmbBlockGridWorkspaceData, + ) { + this._layouts.appendOneAt(layoutEntry, modalData.originData.index ?? -1); + + this.insertBlockData(layoutEntry, content, settings, modalData); + + return true; + } +} + +// TODO: Make discriminator method for this: +export const UMB_BLOCK_GRID_MANAGER_CONTEXT = new UmbContextToken< + UmbBlockGridManagerContext, + UmbBlockGridManagerContext +>('UmbBlockManagerContext'); diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/context/index.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/context/index.ts new file mode 100644 index 0000000000..f652a039d7 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/context/index.ts @@ -0,0 +1,2 @@ +export * from './block-grid-entries.context-token.js'; +export * from './block-grid-entry.context-token.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/index.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/index.ts index 56ebdc81cc..577eea75f4 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/index.ts @@ -1,2 +1,3 @@ -export * from './workspace/index.js'; +export * from './context/index.js'; export * from './types.js'; +export * from './workspace/index.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/property-editors/block-grid-column-span/property-editor-ui-block-grid-column-span.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/property-editors/block-grid-column-span/property-editor-ui-block-grid-column-span.element.ts index 96a236e0e6..f61932dc2d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/property-editors/block-grid-column-span/property-editor-ui-block-grid-column-span.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/property-editors/block-grid-column-span/property-editor-ui-block-grid-column-span.element.ts @@ -1,6 +1,6 @@ import { html, customElement, property, css, state, repeat } from '@umbraco-cms/backoffice/external/lit'; import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/property-editors/block-grid-editor/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/property-editors/block-grid-editor/manifests.ts index 1f722f3d75..aee0e499fe 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/property-editors/block-grid-editor/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/property-editors/block-grid-editor/manifests.ts @@ -1,5 +1,7 @@ import type { ManifestPropertyEditorUi } from '@umbraco-cms/backoffice/extension-registry'; +export const UMB_BLOCK_GRID_PROPERTY_EDITOR_ALIAS = 'Umbraco.BlockGrid'; + export const manifest: ManifestPropertyEditorUi = { type: 'propertyEditorUi', alias: 'Umb.PropertyEditorUi.BlockGrid', @@ -7,7 +9,7 @@ export const manifest: ManifestPropertyEditorUi = { js: () => import('./property-editor-ui-block-grid.element.js'), meta: { label: 'Block Grid', - propertyEditorSchemaAlias: 'Umbraco.BlockGrid', + propertyEditorSchemaAlias: UMB_BLOCK_GRID_PROPERTY_EDITOR_ALIAS, icon: 'icon-layout', group: 'richContent', settings: { diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/property-editors/block-grid-editor/property-editor-ui-block-grid-inner-test.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/property-editors/block-grid-editor/property-editor-ui-block-grid-inner-test.element.ts deleted file mode 100644 index e2494a15eb..0000000000 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/property-editors/block-grid-editor/property-editor-ui-block-grid-inner-test.element.ts +++ /dev/null @@ -1,82 +0,0 @@ -import { html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit'; -import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; -import type { UmbRouterSlotChangeEvent, UmbRouterSlotInitEvent, UmbRoute } from '@umbraco-cms/backoffice/router'; - -/** - * @element umb-property-editor-ui-block-grid-inner-test - */ -@customElement('umb-property-editor-ui-block-grid-inner-test') -export class UmbPropertyEditorUIBlockGridInnerTestElement extends UmbLitElement { - @property({ type: String }) - public name = ''; - - @state() - private _routerPath: string | undefined; - - @state() - private _activePath: string | undefined; - - @state() - private _routes: UmbRoute[] = [ - { - path: 'inner-1', - component: () => { - return new UmbPropertyEditorUIBlockGridInnerTestElement(); - }, - setup: (component) => { - if (component instanceof HTMLElement) { - (component as any).name = 'inner-1'; - } - }, - }, - { - path: 'inner-2', - component: () => { - return new UmbPropertyEditorUIBlockGridInnerTestElement(); - }, - setup: (component) => { - if (component instanceof HTMLElement) { - (component as any).name = 'inner-2'; - } - }, - }, - ]; - - render() { - return html`
- inner: ${this.name} - - - - - - - { - this._routerPath = event.target.absoluteRouterPath; - }} - @change=${(event: UmbRouterSlotChangeEvent) => { - this._activePath = event.target.localActiveViewPath; - }}> -
`; - } - - static styles = [UmbTextStyles]; -} - -export default UmbPropertyEditorUIBlockGridInnerTestElement; - -declare global { - interface HTMLElementTagNameMap { - 'umb-property-editor-ui-block-grid-inner-test': UmbPropertyEditorUIBlockGridInnerTestElement; - } -} diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/property-editors/block-grid-editor/property-editor-ui-block-grid.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/property-editors/block-grid-editor/property-editor-ui-block-grid.element.ts index fccea2bcf0..9a8a6cf5c0 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/property-editors/block-grid-editor/property-editor-ui-block-grid.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/property-editors/block-grid-editor/property-editor-ui-block-grid.element.ts @@ -1,50 +1,32 @@ +import { UmbBlockGridManagerContext } from '../../context/block-grid-manager.context.js'; +import { UMB_BLOCK_GRID_PROPERTY_EDITOR_ALIAS } from './manifests.js'; import { html, customElement, property, state, css } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor'; -import { - UMB_BLOCK_CATALOGUE_MODAL, - type UmbBlockLayoutBaseModel, - type UmbBlockTypeBaseModel, - type UmbBlockTypeGroup, +import type { + UmbBlockGridLayoutModel, + UmbBlockGridTypeModel, + UmbBlockGridValueModel, + UmbBlockTypeGroup, } from '@umbraco-cms/backoffice/block'; -import { type UmbModalRouteBuilder, UmbModalRouteRegistrationController } from '@umbraco-cms/backoffice/modal'; import type { NumberRangeValueType } from '@umbraco-cms/backoffice/models'; -import { UMB_PROPERTY_CONTEXT } from '@umbraco-cms/backoffice/property'; +import { UmbChangeEvent } from '@umbraco-cms/backoffice/event'; +import '../../components/block-grid-entries/index.js'; /** * @element umb-property-editor-ui-block-grid */ @customElement('umb-property-editor-ui-block-grid') export class UmbPropertyEditorUIBlockGridElement extends UmbLitElement implements UmbPropertyEditorUiElement { - #catalogueModal: UmbModalRouteRegistrationController; - - @property() - value = ''; - - @state() - private _limitMin?: number; - @state() - private _limitMax?: number; - - @state() - private _blocks?: Array; - - @state() - private _blockGroups?: Array; - - @state() - private _layouts: Array = []; - - @state() - private _catalogueRouteBuilder?: UmbModalRouteBuilder; - - @state() - private _directRoute?: string; - - @state() - private _createButtonLabel = this.localize.term('blockEditor_addBlock'); + #context = new UmbBlockGridManagerContext(this); + // + private _value: UmbBlockGridValueModel = { + layout: {}, + contentData: [], + settingsData: [], + }; @property({ attribute: false }) public set config(config: UmbPropertyEditorConfigCollection | undefined) { @@ -55,78 +37,71 @@ export class UmbPropertyEditorUIBlockGridElement extends UmbLitElement implement this._limitMin = validationLimit?.min; this._limitMax = validationLimit?.max; - this._blocks = config.getValueByAlias>('blocks') ?? []; - this._blockGroups = config.getValueByAlias>('blockGroups') ?? []; + const blocks = config.getValueByAlias>('blocks') ?? []; + this.#context.setBlockTypes(blocks); - const customCreateButtonLabel = config.getValueByAlias('createLabel'); - if (customCreateButtonLabel) { - this._createButtonLabel = customCreateButtonLabel; - } else if (this._blocks.length === 1) { - this._createButtonLabel = this.localize.term('blockEditor_addThis', [this._blocks[0].label]); - } + const blockGroups = config.getValueByAlias>('blockGroups') ?? []; + this.#context.setBlockGroups(blockGroups); - //const useInlineEditingAsDefault = config.getValueByAlias('useInlineEditingAsDefault'); - - //this.#context.setInlineEditingMode(useInlineEditingAsDefault); - //config.useSingleBlockMode - //config.useLiveEditing - //config.useInlineEditingAsDefault this.style.maxWidth = config.getValueByAlias('maxPropertyWidth') ?? ''; - //this.#context.setEditorConfiguration(config); + //config.useLiveEditing, is covered by the EditorConfiguration of context. + this.#context.setEditorConfiguration(config); } + // + @state() + private _limitMin?: number; + @state() + private _limitMax?: number; + + @property({ attribute: false }) + public get value(): UmbBlockGridValueModel { + return this._value; + } + public set value(value: UmbBlockGridValueModel | undefined) { + const buildUpValue: Partial = value ? { ...value } : {}; + buildUpValue.layout ??= {}; + buildUpValue.contentData ??= []; + buildUpValue.settingsData ??= []; + this._value = buildUpValue as UmbBlockGridValueModel; + + this.#context.setLayouts(this._value.layout[UMB_BLOCK_GRID_PROPERTY_EDITOR_ALIAS] ?? []); + this.#context.setContents(buildUpValue.contentData); + this.#context.setSettings(buildUpValue.settingsData); + } + + @state() + private _rootLayouts: Array = []; + constructor() { super(); - this.consumeContext(UMB_PROPERTY_CONTEXT, (propertyContext) => { - this.observe( - propertyContext?.alias, - (alias) => { - this.#catalogueModal.setUniquePathValue('propertyAlias', alias); - }, - 'observePropertyAlias', - ); + // TODO: Prevent initial notification from these observes: + this.observe(this.#context.layouts, (layouts) => { + this._value = { ...this._value, layout: { [UMB_BLOCK_GRID_PROPERTY_EDITOR_ALIAS]: layouts } }; + // Notify that the value has changed. + //console.log('layout changed', this._value); + // TODO: idea: consider inserting an await here, so other changes could appear first? Maybe some mechanism to only fire change event onces? + this._rootLayouts = layouts; + this.dispatchEvent(new UmbChangeEvent()); + }); + this.observe(this.#context.contents, (contents) => { + this._value = { ...this._value, contentData: contents }; + // Notify that the value has changed. + //console.log('content changed', this._value); + this.dispatchEvent(new UmbChangeEvent()); + }); + this.observe(this.#context.settings, (settings) => { + this._value = { ...this._value, settingsData: settings }; + // Notify that the value has changed. + //console.log('settings changed', this._value); + this.dispatchEvent(new UmbChangeEvent()); }); - - this.#catalogueModal = new UmbModalRouteRegistrationController(this, UMB_BLOCK_CATALOGUE_MODAL) - .addUniquePaths(['propertyAlias']) - .addAdditionalPath(':view/:index') - .onSetup((routingInfo) => { - const index = routingInfo.index ? parseInt(routingInfo.index) : -1; - return { - data: { - blocks: this._blocks ?? [], - blockGroups: this._blockGroups ?? [], - openClipboard: routingInfo.view === 'clipboard', - blockOriginData: { index: index }, - }, - }; - }) - .observeRouteBuilder((routeBuilder) => { - this._catalogueRouteBuilder = routeBuilder; - }); } render() { - if (this._blocks?.length === 1) { - const elementKey = this._blocks[0].contentElementTypeKey; - this._directRoute = - this._catalogueRouteBuilder?.({ view: 'create', index: -1 }) + 'modal/umb-modal-workspace/create/' + elementKey; - } - return html` - - - - - `; + return html``; } static styles = [ diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/property-editors/block-grid-group-configuration/property-editor-ui-block-grid-group-configuration.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/property-editors/block-grid-group-configuration/property-editor-ui-block-grid-group-configuration.element.ts index 333d2258ed..055ca023e3 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/property-editors/block-grid-group-configuration/property-editor-ui-block-grid-group-configuration.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/property-editors/block-grid-group-configuration/property-editor-ui-block-grid-group-configuration.element.ts @@ -1,23 +1,23 @@ import { html, customElement, property, css } from '@umbraco-cms/backoffice/external/lit'; import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { UmbId } from '@umbraco-cms/backoffice/id'; -import type { UmbBlockGridGroupType } from '@umbraco-cms/backoffice/block'; +import type { UmbBlockGridTypeGroupType } from '@umbraco-cms/backoffice/block'; @customElement('umb-property-editor-ui-block-grid-group-configuration') export class UmbPropertyEditorUIBlockGridGroupConfigurationElement extends UmbLitElement implements UmbPropertyEditorUiElement { - private _value: Array = []; + private _value: Array = []; @property({ type: Array }) - public get value(): Array { + public get value(): Array { return this._value; } - public set value(value: Array) { + public set value(value: Array) { this._value = value || []; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/property-editors/block-grid-layout-stylesheet/property-editor-ui-block-grid-layout-stylesheet.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/property-editors/block-grid-layout-stylesheet/property-editor-ui-block-grid-layout-stylesheet.element.ts index 7636cf6ad1..b32bb507ea 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/property-editors/block-grid-layout-stylesheet/property-editor-ui-block-grid-layout-stylesheet.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/property-editors/block-grid-layout-stylesheet/property-editor-ui-block-grid-layout-stylesheet.element.ts @@ -5,7 +5,7 @@ import type { UmbInputStaticFileElement } from '@umbraco-cms/backoffice/static-f import '@umbraco-cms/backoffice/static-file'; import { html, customElement, property } from '@umbraco-cms/backoffice/external/lit'; import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/property-editors/block-grid-type-configuration/property-editor-ui-block-grid-type-configuration.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/property-editors/block-grid-type-configuration/property-editor-ui-block-grid-type-configuration.element.ts index 9714e9cd08..abe1057a33 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/property-editors/block-grid-type-configuration/property-editor-ui-block-grid-type-configuration.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/property-editors/block-grid-type-configuration/property-editor-ui-block-grid-type-configuration.element.ts @@ -7,10 +7,10 @@ import { type UmbPropertyEditorConfigCollection, } from '@umbraco-cms/backoffice/property-editor'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { UMB_BLOCK_GRID_TYPE, - type UmbBlockGridGroupType, + type UmbBlockGridTypeGroupType, type UmbBlockGridGroupTypeConfiguration, } from '@umbraco-cms/backoffice/block'; import type { UUIInputEvent } from '@umbraco-cms/backoffice/external/uui'; @@ -44,7 +44,7 @@ export class UmbPropertyEditorUIBlockGridTypeConfigurationElement public config?: UmbPropertyEditorConfigCollection; @state() - private _blockGroups: Array = []; + private _blockGroups: Array = []; @state() private _mappedValuesAndGroups: Array = []; @@ -76,7 +76,7 @@ export class UmbPropertyEditorUIBlockGridTypeConfigurationElement if (!this.#datasetContext) return; this.observe(await this.#datasetContext.propertyValueByAlias('blockGroups'), (value) => { - this._blockGroups = (value as Array) ?? []; + this._blockGroups = (value as Array) ?? []; this.#mapValuesToBlockGroups(); }); this.observe(await this.#datasetContext.propertyValueByAlias('blocks'), () => { diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/types.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/types.ts index 3a51638811..2c9368c59d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/types.ts @@ -1,8 +1,10 @@ import type { UmbBlockTypeBaseModel, UmbBlockTypeWithGroupKey } from '../block-type/index.js'; +import type { UmbBlockLayoutBaseModel, UmbBlockValueType } from '../index.js'; export const UMB_BLOCK_GRID_TYPE = 'block-grid-type'; -export interface UmbBlockGridType extends UmbBlockTypeBaseModel { +// Configuration models: +export interface UmbBlockGridTypeModel extends UmbBlockTypeBaseModel { columnSpanOptions: Array; allowAtRoot: boolean; allowInAreas: boolean; @@ -13,11 +15,26 @@ export interface UmbBlockGridType extends UmbBlockTypeBaseModel { areas: Array; } -export interface UmbBlockGridGroupType { +export interface UmbBlockGridTypeGroupType { name: string; key: string; } -export interface UmbBlockGridGroupTypeConfiguration extends Partial { +export interface UmbBlockGridGroupTypeConfiguration extends Partial { blocks: Array; } + +// Content models: + +export interface UmbBlockGridValueModel extends UmbBlockValueType {} + +export interface UmbBlockGridLayoutModel extends UmbBlockLayoutBaseModel { + columnSpan: number; + rowSpan: number; + areas: Array; +} + +export interface UmbBlockGridLayoutAreaItemModel { + key: string; + items: Array; +} diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/workspace/views/block-grid-type-workspace-view-advanced.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/workspace/views/block-grid-type-workspace-view-advanced.element.ts index ca143ac5d0..9ce9a584f6 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/workspace/views/block-grid-type-workspace-view-advanced.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/workspace/views/block-grid-type-workspace-view-advanced.element.ts @@ -1,6 +1,6 @@ import { css, html, customElement } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbWorkspaceViewElement } from '@umbraco-cms/backoffice/extension-registry'; @customElement('umb-block-grid-type-workspace-view-advanced') diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/workspace/views/block-grid-type-workspace-view-areas.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/workspace/views/block-grid-type-workspace-view-areas.element.ts index 2baf5dee99..fece05839f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/workspace/views/block-grid-type-workspace-view-areas.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/workspace/views/block-grid-type-workspace-view-areas.element.ts @@ -1,6 +1,6 @@ import { css, html, customElement } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbWorkspaceViewElement } from '@umbraco-cms/backoffice/extension-registry'; @customElement('umb-block-grid-type-workspace-view-areas') diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/workspace/views/block-grid-type-workspace-view-settings.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/workspace/views/block-grid-type-workspace-view-settings.element.ts index d876f8a842..e4769194c8 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/workspace/views/block-grid-type-workspace-view-settings.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/workspace/views/block-grid-type-workspace-view-settings.element.ts @@ -1,6 +1,6 @@ import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbWorkspaceViewElement } from '@umbraco-cms/backoffice/extension-registry'; import { UMB_PROPERTY_DATASET_CONTEXT } from '@umbraco-cms/backoffice/property'; import type { UmbInputNumberRangeElement } from '@umbraco-cms/backoffice/components'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-list/components/block-list-block/index.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-list/components/block-list-block/index.ts deleted file mode 100644 index c18c723a55..0000000000 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block-list/components/block-list-block/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './block-list-block.element.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-list/components/block-list-block/block-list-block.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-list/components/block-list-entry/block-list-entry.element.ts similarity index 60% rename from src/Umbraco.Web.UI.Client/src/packages/block/block-list/components/block-list-block/block-list-block.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/block/block-list/components/block-list-entry/block-list-entry.element.ts index 897f888b4c..b116943e2e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block-list/components/block-list-block/block-list-block.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-list/components/block-list-entry/block-list-entry.element.ts @@ -1,32 +1,28 @@ -import { UmbBlockListContext } from '../../context/block-list.context.js'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; +import { UmbBlockListEntryContext } from '../../context/block-list-entry.context.js'; import { html, css, customElement, property, state } from '@umbraco-cms/backoffice/external/lit'; import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; -import type { UmbBlockLayoutBaseModel } from '@umbraco-cms/backoffice/block'; import '../ref-list-block/index.js'; import '../inline-list-block/index.js'; -import { UMB_CONFIRM_MODAL, UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal'; /** - * @element umb-property-editor-ui-block-list-block + * @element umb-block-list-entry */ -@customElement('umb-property-editor-ui-block-list-block') -export class UmbPropertyEditorUIBlockListBlockElement extends UmbLitElement implements UmbPropertyEditorUiElement { +@customElement('umb-block-list-entry') +export class UmbBlockListEntryElement extends UmbLitElement implements UmbPropertyEditorUiElement { // @property({ attribute: false }) - public get layout(): UmbBlockLayoutBaseModel | undefined { - return this._layout; + public get contentUdi(): string | undefined { + return this._contentUdi; } - public set layout(value: UmbBlockLayoutBaseModel | undefined) { - this._layout = value; - this.#context.setLayout(value); + public set contentUdi(value: string | undefined) { + if (!value) return; + this._contentUdi = value; + this.#context.setContentUdi(value); } - private _layout?: UmbBlockLayoutBaseModel | undefined; + private _contentUdi?: string | undefined; - #context = new UmbBlockListContext(this); - - @state() - _contentUdi?: string; + #context = new UmbBlockListEntryContext(this); @state() _hasSettings = false; @@ -52,36 +48,20 @@ export class UmbPropertyEditorUIBlockListBlockElement extends UmbLitElement impl this.observe(this.#context.workspaceEditPath, (workspaceEditPath) => { this._workspaceEditPath = workspaceEditPath; }); - this.observe(this.#context.contentUdi, (contentUdi) => { - this._contentUdi = contentUdi; - }); this.observe(this.#context.blockTypeSettingsElementTypeKey, (blockTypeSettingsElementTypeKey) => { this._hasSettings = !!blockTypeSettingsElementTypeKey; }); this.observe(this.#context.label, (label) => { + const oldValue = this._label; this._blockViewProps.label = label; this._label = label; + this.requestUpdate('label', oldValue); }); this.observe(this.#context.inlineEditingMode, (inlineEditingMode) => { this._inlineEditingMode = inlineEditingMode; }); } - #requestDelete() { - this.consumeContext(UMB_MODAL_MANAGER_CONTEXT, async (modalManager) => { - const modalContext = modalManager.open(UMB_CONFIRM_MODAL, { - data: { - headline: `Delete ${this._label}`, - content: 'Are you sure you want to delete this [INSERT BLOCK TYPE NAME]?', - confirmLabel: 'Delete', - color: 'danger', - }, - }); - await modalContext.onSubmit(); - this.#context.delete(); - }); - } - #renderRefBlock() { return html``; } @@ -109,7 +89,7 @@ export class UmbPropertyEditorUIBlockListBlockElement extends UmbLitElement impl ` : ''} - + this.#context.requestDelete()}> @@ -117,7 +97,7 @@ export class UmbPropertyEditorUIBlockListBlockElement extends UmbLitElement impl } render() { - return this.layout && this._contentUdi ? this.#renderBlock() : ''; + return this.#renderBlock(); } static styles = [ @@ -139,10 +119,10 @@ export class UmbPropertyEditorUIBlockListBlockElement extends UmbLitElement impl ]; } -export default UmbPropertyEditorUIBlockListBlockElement; +export default UmbBlockListEntryElement; declare global { interface HTMLElementTagNameMap { - 'umb-property-editor-ui-block-list-block': UmbPropertyEditorUIBlockListBlockElement; + 'umb-block-list-entry': UmbBlockListEntryElement; } } diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-list/components/block-list-entry/index.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-list/components/block-list-entry/index.ts new file mode 100644 index 0000000000..353fddef52 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-list/components/block-list-entry/index.ts @@ -0,0 +1 @@ +export * from './block-list-entry.element.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-list/components/inline-list-block/inline-list-block.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-list/components/inline-list-block/inline-list-block.element.ts index 32258343f0..936a15b636 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block-list/components/inline-list-block/inline-list-block.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-list/components/inline-list-block/inline-list-block.element.ts @@ -1,11 +1,11 @@ -import { UMB_BLOCK_LIST_CONTEXT } from '../../index.js'; +import { UMB_BLOCK_LIST_ENTRY_CONTEXT } from '../../index.js'; import type { UMB_BLOCK_WORKSPACE_CONTEXT } from '../../../block/index.js'; import { UMB_BLOCK_WORKSPACE_ALIAS } from '../../../block/index.js'; import { UmbExtensionsApiInitializer, createExtensionApi } from '@umbraco-cms/backoffice/extension-api'; import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; import { css, customElement, html, property, state } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; -import '../../../block/workspace/views/edit/block-workspace-view-edit-no-router.element.js'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; +import '../../../block/workspace/views/edit/block-workspace-view-edit-content-no-router.element.js'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; /** @@ -13,7 +13,7 @@ import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; */ @customElement('umb-inline-list-block') export class UmbInlineListBlockElement extends UmbLitElement { - #blockContext?: typeof UMB_BLOCK_LIST_CONTEXT.TYPE; + #blockContext?: typeof UMB_BLOCK_LIST_ENTRY_CONTEXT.TYPE; #workspaceContext?: typeof UMB_BLOCK_WORKSPACE_CONTEXT.TYPE; #contentUdi?: string; @@ -26,10 +26,10 @@ export class UmbInlineListBlockElement extends UmbLitElement { constructor() { super(); - this.consumeContext(UMB_BLOCK_LIST_CONTEXT, (blockContext) => { + this.consumeContext(UMB_BLOCK_LIST_ENTRY_CONTEXT, (blockContext) => { this.#blockContext = blockContext; this.observe( - this.#blockContext.contentUdi, + this.#blockContext.unique, (contentUdi) => { this.#contentUdi = contentUdi; this.#load(); @@ -43,7 +43,6 @@ export class UmbInlineListBlockElement extends UmbLitElement { if (context) { this.#workspaceContext = context as typeof UMB_BLOCK_WORKSPACE_CONTEXT.TYPE; this.#load(); - this.#workspaceContext.content.createPropertyDatasetContext(this); new UmbExtensionsApiInitializer(this, umbExtensionsRegistry, 'workspaceContext', [ this, @@ -73,7 +72,7 @@ export class UmbInlineListBlockElement extends UmbLitElement { ${this.label} ${this._isOpen === true - ? html`` + ? html`` : ''} `; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-list/components/ref-list-block/ref-list-block.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-list/components/ref-list-block/ref-list-block.element.ts index c83fb11bed..992d43ee2d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block-list/components/ref-list-block/ref-list-block.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-list/components/ref-list-block/ref-list-block.element.ts @@ -1,6 +1,6 @@ -import { UMB_BLOCK_LIST_CONTEXT } from '../../context/block-list.context-token.js'; +import { UMB_BLOCK_ENTRY_CONTEXT } from '@umbraco-cms/backoffice/block'; import { css, customElement, html, property, state } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; /** * @element umb-ref-list-block @@ -17,7 +17,8 @@ export class UmbRefListBlockElement extends UmbLitElement { constructor() { super(); - this.consumeContext(UMB_BLOCK_LIST_CONTEXT, (context) => { + // UMB_BLOCK_LIST_ENTRY_CONTEXT + this.consumeContext(UMB_BLOCK_ENTRY_CONTEXT, (context) => { this.observe( context.workspaceEditPath, (workspaceEditPath) => { diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-list/context/block-list-entries.context-token.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-list/context/block-list-entries.context-token.ts new file mode 100644 index 0000000000..b477dc4685 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-list/context/block-list-entries.context-token.ts @@ -0,0 +1,5 @@ +import type { UmbBlockListEntriesContext } from './block-list-entries.context.js'; +import { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; + +// TODO: Make discriminator method for this: +export const UMB_BLOCK_LIST_ENTRIES_CONTEXT = new UmbContextToken('UmbBlockEntriesContext'); diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-list/context/block-list-entries.context.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-list/context/block-list-entries.context.ts new file mode 100644 index 0000000000..204d95266e --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-list/context/block-list-entries.context.ts @@ -0,0 +1,114 @@ +import type { UmbBlockDataType } from '../../block/index.js'; +import { UMB_BLOCK_CATALOGUE_MODAL, UmbBlockEntriesContext } from '../../block/index.js'; +import type { UmbBlockListWorkspaceData } from '../index.js'; +import type { UmbBlockListLayoutModel, UmbBlockListTypeModel } from '../types.js'; +import { UMB_BLOCK_LIST_MANAGER_CONTEXT } from './block-list-manager.context.js'; +import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; +import { type UmbModalRouteBuilder, UmbModalRouteRegistrationController } from '@umbraco-cms/backoffice/modal'; + +export class UmbBlockListEntriesContext extends UmbBlockEntriesContext< + typeof UMB_BLOCK_LIST_MANAGER_CONTEXT, + typeof UMB_BLOCK_LIST_MANAGER_CONTEXT.TYPE, + UmbBlockListTypeModel, + UmbBlockListLayoutModel +> { + // + #catalogueModal: UmbModalRouteRegistrationController; + #catalogueRouteBuilder?: UmbModalRouteBuilder; + + constructor(host: UmbControllerHost) { + super(host, UMB_BLOCK_LIST_MANAGER_CONTEXT); + + this.#catalogueModal = new UmbModalRouteRegistrationController(this, UMB_BLOCK_CATALOGUE_MODAL) + .addUniquePaths(['propertyAlias', 'variantId']) + .addAdditionalPath(':view/:index') + .onSetup((routingInfo) => { + // Idea: Maybe on setup should be async, so it can retrieve the values when needed? [NL] + const index = routingInfo.index ? parseInt(routingInfo.index) : -1; + return { + data: { + blocks: [], + blockGroups: [], + openClipboard: routingInfo.view === 'clipboard', + blockOriginData: { index: index }, + }, + }; + }) + .observeRouteBuilder((routeBuilder) => { + this.#catalogueRouteBuilder = routeBuilder; + // TODO: Trigger render update? + }); + } + + protected _gotBlockManager() { + if (!this._manager) return; + + this.observe( + this._manager.layouts, + (layouts) => { + this._layoutEntries.setValue(layouts); + }, + 'observeParentLayouts', + ); + this.observe( + this.layoutEntries, + (layouts) => { + this._manager?.setLayouts(layouts); + }, + 'observeThisLayouts', + ); + + this.observe( + this._manager.propertyAlias, + (alias) => { + this.#catalogueModal.setUniquePathValue('propertyAlias', alias ?? 'null'); + }, + 'observePropertyAlias', + ); + + this.observe( + this._manager.variantId, + (variantId) => { + if (variantId) { + this.#catalogueModal.setUniquePathValue('variantId', variantId.toString()); + } + }, + 'observePropertyAlias', + ); + } + + getPathForCreateBlock(index: number) { + return this.#catalogueRouteBuilder?.({ view: 'create', index: index }); + } + + getPathForClipboard(index: number) { + return this.#catalogueRouteBuilder?.({ view: 'clipboard', index: index }); + } + + async create( + contentElementTypeKey: string, + partialLayoutEntry?: Omit, + modalData?: UmbBlockListWorkspaceData, + ) { + await this._retrieveManager; + return this._manager?.create(contentElementTypeKey, partialLayoutEntry, modalData); + } + + // insert Block? + + async insert( + layoutEntry: UmbBlockListLayoutModel, + content: UmbBlockDataType, + settings: UmbBlockDataType | undefined, + modalData: UmbBlockListWorkspaceData, + ) { + await this._retrieveManager; + return this._manager?.insert(layoutEntry, content, settings, modalData) ?? false; + } + + // create Block? + async delete(contentUdi: string) { + // TODO: Loop through children and delete them as well? + await super.delete(contentUdi); + } +} diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-list/context/block-list-entry.context-token.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-list/context/block-list-entry.context-token.ts new file mode 100644 index 0000000000..d914fdf834 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-list/context/block-list-entry.context-token.ts @@ -0,0 +1,5 @@ +import type { UmbBlockListEntryContext } from './block-list-entry.context.js'; +import { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; + +// TODO: Make discriminator method for this: +export const UMB_BLOCK_LIST_ENTRY_CONTEXT = new UmbContextToken('UmbBlockEntryContext'); diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-list/context/block-list.context.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-list/context/block-list-entry.context.ts similarity index 55% rename from src/Umbraco.Web.UI.Client/src/packages/block/block-list/context/block-list.context.ts rename to src/Umbraco.Web.UI.Client/src/packages/block/block-list/context/block-list-entry.context.ts index 60b2c3b4c3..85704cc26e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block-list/context/block-list.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-list/context/block-list-entry.context.ts @@ -1,20 +1,22 @@ -import { UMB_BLOCK_LIST_MANAGER_CONTEXT } from '../manager/block-list-manager.context.js'; -import { UmbBlockContext } from '@umbraco-cms/backoffice/block'; +import { UMB_BLOCK_LIST_MANAGER_CONTEXT } from './block-list-manager.context.js'; +import { UMB_BLOCK_LIST_ENTRIES_CONTEXT } from './block-list-entries.context-token.js'; +import { UmbBlockEntryContext } from '@umbraco-cms/backoffice/block'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { UmbBooleanState } from '@umbraco-cms/backoffice/observable-api'; -export class UmbBlockListContext extends UmbBlockContext< +export class UmbBlockListEntryContext extends UmbBlockEntryContext< typeof UMB_BLOCK_LIST_MANAGER_CONTEXT, - typeof UMB_BLOCK_LIST_MANAGER_CONTEXT.TYPE + typeof UMB_BLOCK_LIST_MANAGER_CONTEXT.TYPE, + typeof UMB_BLOCK_LIST_ENTRIES_CONTEXT, + typeof UMB_BLOCK_LIST_ENTRIES_CONTEXT.TYPE > { #inlineEditingMode = new UmbBooleanState(undefined); inlineEditingMode = this.#inlineEditingMode.asObservable(); constructor(host: UmbControllerHost) { - super(host, UMB_BLOCK_LIST_MANAGER_CONTEXT); + super(host, UMB_BLOCK_LIST_MANAGER_CONTEXT, UMB_BLOCK_LIST_ENTRIES_CONTEXT); } _gotManager() { - super._gotManager(); if (this._manager) { this.observe( this._manager.inlineEditingMode, @@ -27,4 +29,6 @@ export class UmbBlockListContext extends UmbBlockContext< this.removeControllerByAlias('observeInlineEditingMode'); } } + + _gotEntries() {} } diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-list/manager/block-list-manager.context.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-list/context/block-list-manager.context.ts similarity index 59% rename from src/Umbraco.Web.UI.Client/src/packages/block/block-list/manager/block-list-manager.context.ts rename to src/Umbraco.Web.UI.Client/src/packages/block/block-list/context/block-list-manager.context.ts index 265645fe82..9b68ec912b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block-list/manager/block-list-manager.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-list/context/block-list-manager.context.ts @@ -1,32 +1,47 @@ import type { UmbBlockListLayoutModel, UmbBlockListTypeModel } from '../types.js'; -import { UmbBlockManagerContext } from '../../block/manager/block-manager.context.js'; +import { UmbBlockManagerContext } from '../../block/context/block-manager.context.js'; import type { UmbBlockListWorkspaceData } from '../index.js'; +import type { UmbBlockDataType } from '../../block/types.js'; import { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; import { UmbBooleanState } from '@umbraco-cms/backoffice/observable-api'; /** - * A implementation of the Block Manager specifically for the Block List. + * A implementation of the Block Manager specifically for the Block List Editor. */ export class UmbBlockListManagerContext< BlockLayoutType extends UmbBlockListLayoutModel = UmbBlockListLayoutModel, > extends UmbBlockManagerContext { // #inlineEditingMode = new UmbBooleanState(undefined); - inlineEditingMode = this.#inlineEditingMode.asObservable(); + readonly inlineEditingMode = this.#inlineEditingMode.asObservable(); setInlineEditingMode(inlineEditingMode: boolean | undefined) { this.#inlineEditingMode.setValue(inlineEditingMode ?? false); } - _createBlock(modalData: UmbBlockListWorkspaceData, layoutEntry: BlockLayoutType, contentElementTypeKey: string) { - // Here is room to append some extra layout properties if needed for this type. + create( + contentElementTypeKey: string, + partialLayoutEntry?: Omit, + modalData?: UmbBlockListWorkspaceData, + ) { + return super.createBlockData(contentElementTypeKey, partialLayoutEntry); + } + insert( + layoutEntry: BlockLayoutType, + content: UmbBlockDataType, + settings: UmbBlockDataType | undefined, + modalData: UmbBlockListWorkspaceData, + ) { this._layouts.appendOneAt(layoutEntry, modalData.originData.index ?? -1); + this.insertBlockData(layoutEntry, content, settings, modalData); + return true; } } +// TODO: Make discriminator method for this: export const UMB_BLOCK_LIST_MANAGER_CONTEXT = new UmbContextToken< UmbBlockListManagerContext, UmbBlockListManagerContext diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-list/context/block-list.context-token.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-list/context/block-list.context-token.ts deleted file mode 100644 index f5ac6af1ec..0000000000 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block-list/context/block-list.context-token.ts +++ /dev/null @@ -1,4 +0,0 @@ -import type { UmbBlockListContext } from './block-list.context.js'; -import { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; - -export const UMB_BLOCK_LIST_CONTEXT = new UmbContextToken('UmbBlockContext'); diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-list/context/index.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-list/context/index.ts new file mode 100644 index 0000000000..235016411e --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-list/context/index.ts @@ -0,0 +1 @@ +export * from './block-list-entry.context-token.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-list/index.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-list/index.ts index 06bff7c73b..577eea75f4 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block-list/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-list/index.ts @@ -1,2 +1,3 @@ +export * from './context/index.js'; +export * from './types.js'; export * from './workspace/index.js'; -export * from './context/block-list.context-token.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-list/property-editors/block-list-editor/property-editor-ui-block-list.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-list/property-editors/block-list-editor/property-editor-ui-block-list.element.ts index f8671c248d..7c7e7884a4 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block-list/property-editors/block-list-editor/property-editor-ui-block-list.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-list/property-editors/block-list-editor/property-editor-ui-block-list.element.ts @@ -1,14 +1,16 @@ -import { UmbBlockListManagerContext } from '../../manager/block-list-manager.context.js'; -import '../../components/block-list-block/index.js'; -import type { UmbPropertyEditorUIBlockListBlockElement } from '../../components/block-list-block/index.js'; +import { UmbBlockListManagerContext } from '../../context/block-list-manager.context.js'; +import '../../components/block-list-entry/index.js'; +import type { UmbBlockListEntryElement } from '../../components/block-list-entry/index.js'; +import type { UmbBlockListLayoutModel, UmbBlockListValueModel } from '../../types.js'; +import { UmbBlockListEntriesContext } from '../../context/block-list-entries.context.js'; import { UMB_BLOCK_LIST_PROPERTY_EDITOR_ALIAS } from './manifests.js'; import { html, customElement, property, state, repeat, css } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor'; import { UMB_BLOCK_CATALOGUE_MODAL } from '@umbraco-cms/backoffice/block'; -import type { UmbBlockLayoutBaseModel, UmbBlockTypeBaseModel, UmbBlockValueType } from '@umbraco-cms/backoffice/block'; +import type { UmbBlockLayoutBaseModel, UmbBlockTypeBaseModel } from '@umbraco-cms/backoffice/block'; import type { NumberRangeValueType } from '@umbraco-cms/backoffice/models'; import type { UmbModalRouteBuilder } from '@umbraco-cms/backoffice/modal'; import { UmbModalRouteRegistrationController } from '@umbraco-cms/backoffice/modal'; @@ -17,19 +19,15 @@ import type { UmbSorterConfig } from '@umbraco-cms/backoffice/sorter'; import { UmbSorterController } from '@umbraco-cms/backoffice/sorter'; import { UMB_PROPERTY_CONTEXT } from '@umbraco-cms/backoffice/property'; -export interface UmbBlockListLayoutModel extends UmbBlockLayoutBaseModel {} - -export interface UmbBlockListValueModel extends UmbBlockValueType {} - -const SORTER_CONFIG: UmbSorterConfig = { +const SORTER_CONFIG: UmbSorterConfig = { getUniqueOfElement: (element) => { - return element.getAttribute('data-udi'); + return element.contentUdi!; }, getUniqueOfModel: (modelEntry) => { return modelEntry.contentUdi; }, - identifier: 'block-list-editor', - itemSelector: 'umb-property-editor-ui-block-list-block', + //identifier: 'block-list-editor', + itemSelector: 'umb-block-list-entry', //containerSelector: 'EMPTY ON PURPOSE, SO IT BECOMES THE HOST ELEMENT', }; @@ -39,10 +37,10 @@ const SORTER_CONFIG: UmbSorterConfig(this, { + #sorter = new UmbSorterController(this, { ...SORTER_CONFIG, onChange: ({ model }) => { - this.#context.setLayouts(model); + this.#entriesContext.setLayouts(model); }, }); @@ -65,9 +63,9 @@ export class UmbPropertyEditorUIBlockListElement extends UmbLitElement implement buildUpValue.settingsData ??= []; this._value = buildUpValue as UmbBlockListValueModel; - this.#context.setLayouts(this._value.layout[UMB_BLOCK_LIST_PROPERTY_EDITOR_ALIAS] ?? []); - this.#context.setContents(buildUpValue.contentData); - this.#context.setSettings(buildUpValue.settingsData); + this.#managerContext.setLayouts(this._value.layout[UMB_BLOCK_LIST_PROPERTY_EDITOR_ALIAS] ?? []); + this.#managerContext.setContents(buildUpValue.contentData); + this.#managerContext.setSettings(buildUpValue.settingsData); } @state() @@ -83,7 +81,7 @@ export class UmbPropertyEditorUIBlockListElement extends UmbLitElement implement this._limitMax = validationLimit?.max; const blocks = config.getValueByAlias>('blocks') ?? []; - this.#context.setBlockTypes(blocks); + this.#managerContext.setBlockTypes(blocks); const customCreateButtonLabel = config.getValueByAlias('createLabel'); if (customCreateButtonLabel) { @@ -93,13 +91,12 @@ export class UmbPropertyEditorUIBlockListElement extends UmbLitElement implement } const useInlineEditingAsDefault = config.getValueByAlias('useInlineEditingAsDefault'); - this.#context.setInlineEditingMode(useInlineEditingAsDefault); - //config.useSingleBlockMode - //config.useLiveEditing - //config.useInlineEditingAsDefault + this.#managerContext.setInlineEditingMode(useInlineEditingAsDefault); + // TODO: + //config.useSingleBlockMode, not done jey this.style.maxWidth = config.getValueByAlias('maxPropertyWidth') ?? ''; - this.#context.setEditorConfiguration(config); + this.#managerContext.setEditorConfiguration(config); } @state() @@ -116,10 +113,8 @@ export class UmbPropertyEditorUIBlockListElement extends UmbLitElement implement @state() private _catalogueRouteBuilder?: UmbModalRouteBuilder; - @state() - private _directRoute?: string; - - #context = new UmbBlockListManagerContext(this); + #managerContext = new UmbBlockListManagerContext(this); + #entriesContext = new UmbBlockListEntriesContext(this); constructor() { super(); @@ -135,28 +130,34 @@ export class UmbPropertyEditorUIBlockListElement extends UmbLitElement implement }); // TODO: Prevent initial notification from these observes: - this.observe(this.#context.layouts, (layouts) => { + this.observe(this.#managerContext.layouts, (layouts) => { this._value = { ...this._value, layout: { [UMB_BLOCK_LIST_PROPERTY_EDITOR_ALIAS]: layouts } }; // Notify that the value has changed. //console.log('layout changed', this._value); // TODO: idea: consider inserting an await here, so other changes could appear first? Maybe some mechanism to only fire change event onces? - this._layouts = layouts; - this.#sorter.setModel(layouts); + //this.#entriesContext.setLayoutEntries(layouts); this.dispatchEvent(new UmbChangeEvent()); }); - this.observe(this.#context.contents, (contents) => { + this.observe(this.#entriesContext.layoutEntries, (layouts) => { + this._layouts = layouts; + // Update sorter. + this.#sorter.setModel(layouts); + // Update manager: + this.#managerContext.setLayouts(layouts); + }); + this.observe(this.#managerContext.contents, (contents) => { this._value = { ...this._value, contentData: contents }; // Notify that the value has changed. //console.log('content changed', this._value); this.dispatchEvent(new UmbChangeEvent()); }); - this.observe(this.#context.settings, (settings) => { + this.observe(this.#managerContext.settings, (settings) => { this._value = { ...this._value, settingsData: settings }; // Notify that the value has changed. //console.log('settings changed', this._value); this.dispatchEvent(new UmbChangeEvent()); }); - this.observe(this.#context.blockTypes, (blockTypes) => { + this.observe(this.#managerContext.blockTypes, (blockTypes) => { this._blocks = blockTypes; }); @@ -179,10 +180,13 @@ export class UmbPropertyEditorUIBlockListElement extends UmbLitElement implement } render() { + let createPath: string | undefined; if (this._blocks?.length === 1) { const elementKey = this._blocks[0].contentElementTypeKey; - this._directRoute = + createPath = this._catalogueRouteBuilder?.({ view: 'create', index: -1 }) + 'modal/umb-modal-workspace/create/' + elementKey; + } else { + createPath = this._catalogueRouteBuilder?.({ view: 'create', index: -1 }); } return html` ${repeat( this._layouts, @@ -190,15 +194,15 @@ export class UmbPropertyEditorUIBlockListElement extends UmbLitElement implement (layoutEntry, index) => html` - - `, + + `, )} + href=${createPath ?? ''}> {} diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-list/workspace/views/block-list-type-workspace-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-list/workspace/views/block-list-type-workspace-view.element.ts index 84efd3766d..1c74663f45 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block-list/workspace/views/block-list-type-workspace-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-list/workspace/views/block-list-type-workspace-view.element.ts @@ -1,6 +1,6 @@ import { css, html, customElement } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbWorkspaceViewElement } from '@umbraco-cms/backoffice/extension-registry'; @customElement('umb-block-list-type-workspace-view-settings') diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-rte/workspace/views/block-rte-type-workspace-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-rte/workspace/views/block-rte-type-workspace-view.element.ts index d745f0c10f..cbc331568e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block-rte/workspace/views/block-rte-type-workspace-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-rte/workspace/views/block-rte-type-workspace-view.element.ts @@ -1,6 +1,6 @@ import { css, html, customElement } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbWorkspaceViewElement } from '@umbraco-cms/backoffice/extension-registry'; @customElement('umb-block-rte-type-workspace-view-settings') diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-type/components/block-type-card/block-type-card.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-type/components/block-type-card/block-type-card.element.ts index b7732995ce..38a6e14d17 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block-type/components/block-type-card/block-type-card.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-type/components/block-type-card/block-type-card.element.ts @@ -6,7 +6,7 @@ import { UmbDeleteEvent } from '@umbraco-cms/backoffice/event'; import { html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit'; import { UMB_CONFIRM_MODAL, UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal'; import { UmbRepositoryItemsManager } from '@umbraco-cms/backoffice/repository'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-block-type-card') export class UmbBlockTypeCardElement extends UmbLitElement { @@ -58,7 +58,7 @@ export class UmbBlockTypeCardElement extends UmbLitElement { data: { color: 'danger', headline: `Remove ${this._name}?`, - content: 'Are you sure you want to remove this item', + content: 'Are you sure you want to remove this block type?', confirmLabel: 'Remove', }, }); diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-type/components/input-block-type/input-block-type.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-type/components/input-block-type/input-block-type.element.ts index 1dcad5fdf3..9cf0faa8d4 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block-type/components/input-block-type/input-block-type.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-type/components/input-block-type/input-block-type.element.ts @@ -2,7 +2,7 @@ import type { UmbBlockTypeBaseModel } from '../../types.js'; import { UMB_DOCUMENT_TYPE_PICKER_MODAL, UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal'; import '../block-type-card/index.js'; import { css, html, customElement, property, state, repeat } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbPropertyDatasetContext } from '@umbraco-cms/backoffice/property'; import { UMB_PROPERTY_DATASET_CONTEXT } from '@umbraco-cms/backoffice/property'; import { UmbChangeEvent } from '@umbraco-cms/backoffice/event'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-type/property-editors/block-type-group-configuration/property-editor-ui-block-type-group-configuration.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-type/property-editors/block-type-group-configuration/property-editor-ui-block-type-group-configuration.element.ts index 918e704be3..c6cfeb5a8a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block-type/property-editors/block-type-group-configuration/property-editor-ui-block-type-group-configuration.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-type/property-editors/block-type-group-configuration/property-editor-ui-block-type-group-configuration.element.ts @@ -2,7 +2,7 @@ import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extensi import { html, customElement, property } from '@umbraco-cms/backoffice/external/lit'; import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; /** * @element umb-property-editor-ui-block-type-group-configuration diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-type/workspace/block-type-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-type/workspace/block-type-workspace-editor.element.ts index 97b8c61af0..9030804b9a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block-type/workspace/block-type-workspace-editor.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-type/workspace/block-type-workspace-editor.element.ts @@ -1,7 +1,7 @@ import { UMB_BLOCK_TYPE_WORKSPACE_CONTEXT } from './block-type-workspace.context.js'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { customElement, css, html, state, property } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { UmbRepositoryItemsManager } from '@umbraco-cms/backoffice/repository'; import type { UmbDocumentTypeItemModel } from '@umbraco-cms/backoffice/document-type'; import { DOCUMENT_TYPE_ITEM_REPOSITORY_ALIAS } from '@umbraco-cms/backoffice/document-type'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-type/workspace/block-type-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-type/workspace/block-type-workspace.element.ts index af2c7dda6a..960d26442f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block-type/workspace/block-type-workspace.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-type/workspace/block-type-workspace.element.ts @@ -3,7 +3,7 @@ import { UmbBlockTypeWorkspaceEditorElement } from './block-type-workspace-edito import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; import type { UmbRoute } from '@umbraco-cms/backoffice/router'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { UmbWorkspaceIsNewRedirectController } from '@umbraco-cms/backoffice/workspace'; import type { UmbApi } from '@umbraco-cms/backoffice/extension-api'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block/context/block-entries.context-token.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/context/block-entries.context-token.ts new file mode 100644 index 0000000000..24a368beef --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block/context/block-entries.context-token.ts @@ -0,0 +1,14 @@ +import type { UmbBlockTypeBaseModel } from '../../block-type/types.js'; +import type { UmbBlockLayoutBaseModel } from '../types.js'; +import type { UmbBlockEntriesContext } from './block-entries.context.js'; +import type { UMB_BLOCK_MANAGER_CONTEXT } from './block-manager.context-token.js'; +import { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; + +export const UMB_BLOCK_ENTRIES_CONTEXT = new UmbContextToken< + UmbBlockEntriesContext< + typeof UMB_BLOCK_MANAGER_CONTEXT, + typeof UMB_BLOCK_MANAGER_CONTEXT.TYPE, + UmbBlockTypeBaseModel, + UmbBlockLayoutBaseModel + > +>('UmbBlockEntriesContext'); diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block/context/block-entries.context.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/context/block-entries.context.ts new file mode 100644 index 0000000000..e1cc7bc7e4 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block/context/block-entries.context.ts @@ -0,0 +1,119 @@ +import type { UmbBlockTypeBaseModel } from '../../block-type/types.js'; +import type { UmbBlockDataType, UmbBlockLayoutBaseModel } from '../types.js'; +import { UMB_BLOCK_WORKSPACE_MODAL } from '../workspace/block-workspace.modal-token.js'; +import type { UmbBlockDataObjectModel, UmbBlockManagerContext } from './block-manager.context.js'; +import { UMB_BLOCK_ENTRIES_CONTEXT } from './block-entries.context-token.js'; +import type { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; +import { UmbContextBase } from '@umbraco-cms/backoffice/class-api'; +import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; +import { UmbArrayState, UmbStringState } from '@umbraco-cms/backoffice/observable-api'; +import { UmbModalRouteRegistrationController } from '@umbraco-cms/backoffice/modal'; + +export abstract class UmbBlockEntriesContext< + BlockManagerContextTokenType extends UmbContextToken, + BlockManagerContextType extends UmbBlockManagerContext, + BlockType extends UmbBlockTypeBaseModel, + BlockLayoutType extends UmbBlockLayoutBaseModel, +> extends UmbContextBase< + UmbBlockEntriesContext +> { + // + _manager?: BlockManagerContextType; + _retrieveManager; + + _workspaceModal: UmbModalRouteRegistrationController; + + #workspacePath = new UmbStringState(undefined); + workspacePath = this.#workspacePath.asObservable(); + + protected _layoutEntries = new UmbArrayState([], (x) => x.contentUdi); + readonly layoutEntries = this._layoutEntries.asObservable(); + readonly layoutEntriesLength = this._layoutEntries.asObservablePart((x) => x.length); + + constructor(host: UmbControllerHost, blockManagerContextToken: BlockManagerContextTokenType) { + super(host, UMB_BLOCK_ENTRIES_CONTEXT.toString()); + + // TODO: Observe Blocks of the layout entries of this component. + this._retrieveManager = this.consumeContext(blockManagerContextToken, (blockGridManager) => { + this._manager = blockGridManager; + this._gotBlockManager(); + + this.observe( + this._manager.propertyAlias, + (alias) => { + this._workspaceModal.setUniquePathValue('propertyAlias', alias); + }, + 'observePropertyAlias', + ); + this.observe( + this._manager.variantId, + (variantId) => { + // TODO: This might not be the property variant ID, but the content variant ID. Check up on what makes most sense? + this._workspaceModal.setUniquePathValue('variantId', variantId?.toString()); + }, + 'observePropertyVariantId', + ); + }).asPromise(); + + this._workspaceModal = new UmbModalRouteRegistrationController(this, UMB_BLOCK_WORKSPACE_MODAL) + .addUniquePaths(['propertyAlias', 'variantId']) + .addAdditionalPath('block') + .onSetup(() => { + return { data: { entityType: 'block', preset: {} }, modal: { size: 'medium' } }; + }) + .observeRouteBuilder((routeBuilder) => { + const newPath = routeBuilder({}); + this.#workspacePath.setValue(newPath); + }); + } + + protected abstract _gotBlockManager(): void; + + // Public methods: + + layoutOf(contentUdi: string) { + return this._layoutEntries.asObservablePart((source) => source.find((x) => x.contentUdi === contentUdi)); + } + setLayouts(layouts: Array) { + return this._layoutEntries.setValue(layouts); + } + setOneLayout(layoutData: BlockLayoutType) { + return this._layoutEntries.appendOne(layoutData); + } + + public abstract getPathForCreateBlock(index: number): string | undefined; + public abstract getPathForClipboard(index: number): string | undefined; + + public abstract create( + contentElementTypeKey: string, + layoutEntry?: Omit, + modalData?: typeof UMB_BLOCK_WORKSPACE_MODAL.DATA, + ): Promise | undefined>; + + abstract insert( + layoutEntry: BlockLayoutType, + content: UmbBlockDataType, + settings: UmbBlockDataType | undefined, + modalData: typeof UMB_BLOCK_WORKSPACE_MODAL.DATA, + ): Promise; + //edit? + //editSettings + + // Idea: should we return true if it was successful? + public async delete(contentUdi: string) { + await this._retrieveManager; + const layout = this._layoutEntries.value.find((x) => x.contentUdi === contentUdi); + if (!layout) { + throw new Error(`Cannot delete block, missing layout for ${contentUdi}`); + } + + if (layout.settingsUdi) { + this._manager?.removeOneSettings(layout.settingsUdi); + } + + this._manager?.removeOneContent(contentUdi); + + this._layoutEntries.removeOne(contentUdi); + } + //copy +} diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block/context/block-entry.context-token.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/context/block-entry.context-token.ts new file mode 100644 index 0000000000..eb32877475 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block/context/block-entry.context-token.ts @@ -0,0 +1,23 @@ +import type { UmbBlockTypeBaseModel } from '../../block-type/types.js'; +import type { UmbBlockLayoutBaseModel } from '../types.js'; +import type { UMB_BLOCK_ENTRIES_CONTEXT } from './block-entries.context-token.js'; +import type { UmbBlockEntriesContext } from './block-entries.context.js'; +import type { UmbBlockEntryContext } from './block-entry.context.js'; +import type { UMB_BLOCK_MANAGER_CONTEXT } from './block-manager.context-token.js'; +import { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; + +export const UMB_BLOCK_ENTRY_CONTEXT = new UmbContextToken< + UmbBlockEntryContext< + typeof UMB_BLOCK_MANAGER_CONTEXT, + typeof UMB_BLOCK_MANAGER_CONTEXT.TYPE, + typeof UMB_BLOCK_ENTRIES_CONTEXT, + UmbBlockEntriesContext< + typeof UMB_BLOCK_MANAGER_CONTEXT, + typeof UMB_BLOCK_MANAGER_CONTEXT.TYPE, + UmbBlockTypeBaseModel, + UmbBlockLayoutBaseModel + >, + UmbBlockTypeBaseModel, + UmbBlockLayoutBaseModel + > +>('UmbBlockEntryContext'); diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block/context/block-entity.context.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/context/block-entry.context.ts similarity index 58% rename from src/Umbraco.Web.UI.Client/src/packages/block/block/context/block-entity.context.ts rename to src/Umbraco.Web.UI.Client/src/packages/block/block/context/block-entry.context.ts index 9f9d417e10..37c8af1843 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block/context/block-entity.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block/context/block-entry.context.ts @@ -1,36 +1,48 @@ import type { UmbBlockTypeBaseModel } from '../../block-type/types.js'; import type { UmbBlockLayoutBaseModel, UmbBlockDataType } from '../types.js'; -import type { UMB_BLOCK_MANAGER_CONTEXT, UmbBlockManagerContext } from '../manager/index.js'; -import { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; +import type { UmbBlockManagerContext } from '../index.js'; +import type { UmbBlockEntriesContext } from './block-entries.context.js'; +import type { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; import { UmbContextBase } from '@umbraco-cms/backoffice/class-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { UmbObjectState, UmbStringState } from '@umbraco-cms/backoffice/observable-api'; import { encodeFilePath } from '@umbraco-cms/backoffice/utils'; +import { UMB_CONFIRM_MODAL, UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal'; -export abstract class UmbBlockContext< - BlockManagerContextTokenType extends UmbContextToken, +export abstract class UmbBlockEntryContext< + BlockManagerContextTokenType extends UmbContextToken, BlockManagerContextType extends UmbBlockManagerContext, + BlockEntriesContextTokenType extends UmbContextToken, + BlockEntriesContextType extends UmbBlockEntriesContext< + BlockManagerContextTokenType, + BlockManagerContextType, + BlockType, + BlockLayoutType + >, BlockType extends UmbBlockTypeBaseModel = UmbBlockTypeBaseModel, BlockLayoutType extends UmbBlockLayoutBaseModel = UmbBlockLayoutBaseModel, -> extends UmbContextBase< - UmbBlockContext -> { +> extends UmbContextBase { // _manager?: BlockManagerContextType; + _entries?: BlockEntriesContextType; + + #contentUdi?: string; #blockTypeName = new UmbStringState(undefined); public readonly blockTypeName = this.#blockTypeName.asObservable(); + // TODO: index state + observable? + #label = new UmbStringState(''); public readonly label = this.#label.asObservable(); #workspacePath = new UmbStringState(undefined); public readonly workspacePath = this.#workspacePath.asObservable(); - public readonly workspaceEditPath = this.#workspacePath.asObservablePart( - (path) => path + 'edit/' + encodeFilePath(this.getContentUdi() ?? ''), + public readonly workspaceEditPath = this.#workspacePath.asObservablePart((path) => + path ? path + 'edit/' + encodeFilePath(this.getContentUdi() ?? '') : '', ); - public readonly workspaceEditSettingsPath = this.#workspacePath.asObservablePart( - (path) => path + 'edit/' + encodeFilePath(this.getContentUdi() ?? '') + '/view/settings', + public readonly workspaceEditSettingsPath = this.#workspacePath.asObservablePart((path) => + path ? path + 'edit/' + encodeFilePath(this.getContentUdi() ?? '') + '/view/settings' : '', ); _blockType = new UmbObjectState(undefined); @@ -38,38 +50,66 @@ export abstract class UmbBlockContext< public readonly blockTypeContentElementTypeKey = this._blockType.asObservablePart((x) => x?.contentElementTypeKey); public readonly blockTypeSettingsElementTypeKey = this._blockType.asObservablePart((x) => x?.settingsElementTypeKey); - #layout = new UmbObjectState(undefined); - public readonly layout = this.#layout.asObservable(); - public readonly contentUdi = this.#layout.asObservablePart((x) => x?.contentUdi); + _layout = new UmbObjectState(undefined); + public readonly layout = this._layout.asObservable(); + /** + * @obsolete Use `unique` instead. Cause we will most likely rename this in the future. + */ + public readonly contentUdi = this._layout.asObservablePart((x) => x?.contentUdi); + public readonly unique = this._layout.asObservablePart((x) => x?.contentUdi); #content = new UmbObjectState(undefined); public readonly content = this.#content.asObservable(); public readonly contentTypeKey = this.#content.asObservablePart((x) => x?.contentTypeKey); + // TODO: Make sure changes to the Block Content / Settings are reflected back to Manager. + #settings = new UmbObjectState(undefined); public readonly settings = this.#settings.asObservable(); /** - * Set the layout entry object. - * @method setLayout - * @param {BlockLayoutType | undefined} layout entry object. + * Set the contentUdi of this entry. + * @method setContentUdi + * @param {string} contentUdi the entry content UDI. * @returns {void} */ - setLayout(layout: BlockLayoutType | undefined) { - this.#layout.setValue(layout); + setContentUdi(contentUdi: string) { + this.#contentUdi = contentUdi; + this.#observeLayout(); } - constructor(host: UmbControllerHost, blockManagerContextToken: BlockManagerContextTokenType) { - super(host, UMB_BLOCK_ENTITY_CONTEXT.toString()); + /** + * Get the current value of this Blocks label. + * @method getLabel + * @returns {string} + */ + getLabel() { + return this.#label.value; + } + + constructor( + host: UmbControllerHost, + blockManagerContextToken: BlockManagerContextTokenType, + blockEntriesContextToken: BlockEntriesContextTokenType, + ) { + super(host, 'UmbBlockEntryContext'); // Consume block manager: this.consumeContext(blockManagerContextToken, (manager) => { this._manager = manager; + this.#gotManager(); this._gotManager(); }); + // Consume block entries: + this.consumeContext(blockEntriesContextToken, (entries) => { + this._entries = entries; + this.#gotEntries(); + this._gotEntries(); + }); + // Observe UDI: - this.observe(this.contentUdi, (contentUdi) => { + this.observe(this.unique, (contentUdi) => { if (!contentUdi) return; this.#observeData(); }); @@ -89,13 +129,42 @@ export abstract class UmbBlockContext< } getContentUdi() { - return this.#layout.value?.contentUdi; + return this._layout.value?.contentUdi; } - _gotManager() { - if (this._manager) { + #observeLayout() { + if (!this._entries || !this.#contentUdi) return; + + this.observe( + this._entries.layoutOf(this.#contentUdi), + (layout) => { + this._layout.setValue(layout); + }, + 'observeParentLayout', + ); + this.observe( + this.layout, + (layout) => { + if (layout) { + this._entries?.setOneLayout(layout); + } + }, + 'observeThisLayout', + ); + } + + #gotManager() { + this.#observeBlockType(); + this.#observeData(); + } + + abstract _gotManager(): void; + + #gotEntries() { + this.#observeLayout(); + if (this._entries) { this.observe( - this._manager.workspacePath, + this._entries.workspacePath, (workspacePath) => { this.#workspacePath.setValue(workspacePath); }, @@ -104,13 +173,13 @@ export abstract class UmbBlockContext< } else { this.removeControllerByAlias('observeWorkspacePath'); } - this.#observeBlockType(); - this.#observeData(); } + abstract _gotEntries(): void; + #observeData() { if (!this._manager) return; - const contentUdi = this.#layout.value?.contentUdi; + const contentUdi = this._layout.value?.contentUdi; if (!contentUdi) return; // observe content: @@ -123,7 +192,7 @@ export abstract class UmbBlockContext< ); // observe settings: - const settingsUdi = this.#layout.value?.settingsUdi; + const settingsUdi = this._layout.value?.settingsUdi; if (settingsUdi) { this.observe( this._manager.contentOf(settingsUdi), @@ -190,14 +259,30 @@ export abstract class UmbBlockContext< // Public methods: - public delete() { - if (!this._manager) return; - const contentUdi = this.#layout.value?.contentUdi; - if (!contentUdi) return; - this._manager.deleteBlock(contentUdi); - } -} + //activate + public edit() {} + //editSettings -export const UMB_BLOCK_ENTITY_CONTEXT = new UmbContextToken< - UmbBlockContext ->('UmbBlockContext'); + requestDelete() { + this.consumeContext(UMB_MODAL_MANAGER_CONTEXT, async (modalManager) => { + const modalContext = modalManager.open(UMB_CONFIRM_MODAL, { + data: { + headline: `Delete ${this.getLabel()}`, + content: 'Are you sure you want to delete this [INSERT BLOCK TYPE NAME]?', + confirmLabel: 'Delete', + color: 'danger', + }, + }); + await modalContext.onSubmit(); + this.delete(); + }); + } + public delete() { + if (!this._entries) return; + const contentUdi = this._layout.value?.contentUdi; + if (!contentUdi) return; + this._entries.delete(contentUdi); + } + + //copy +} diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block/manager/block-manager.context-token.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/context/block-manager.context-token.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/block/block/manager/block-manager.context-token.ts rename to src/Umbraco.Web.UI.Client/src/packages/block/block/context/block-manager.context-token.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block/manager/block-manager.context.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/context/block-manager.context.ts similarity index 64% rename from src/Umbraco.Web.UI.Client/src/packages/block/block/manager/block-manager.context.ts rename to src/Umbraco.Web.UI.Client/src/packages/block/block/context/block-manager.context.ts index 0ab646f59a..ad41087a61 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block/manager/block-manager.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block/context/block-manager.context.ts @@ -5,15 +5,18 @@ import { UmbArrayState, UmbClassState, UmbStringState } from '@umbraco-cms/backo import { UmbDocumentTypeDetailRepository } from '@umbraco-cms/backoffice/document-type'; import { buildUdi, getKeyFromUdi } from '@umbraco-cms/backoffice/utils'; import type { UmbBlockTypeBaseModel, UmbBlockWorkspaceData } from '@umbraco-cms/backoffice/block'; -import { UMB_BLOCK_MANAGER_CONTEXT, UMB_BLOCK_WORKSPACE_MODAL } from '@umbraco-cms/backoffice/block'; -import { UmbModalRouteRegistrationController } from '@umbraco-cms/backoffice/modal'; +import { UMB_BLOCK_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/block'; import type { UmbContentTypeModel } from '@umbraco-cms/backoffice/content-type'; import { UmbId } from '@umbraco-cms/backoffice/id'; import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor'; +import { UMB_PROPERTY_CONTEXT } from '@umbraco-cms/backoffice/property'; +import type { UmbVariantId } from '@umbraco-cms/backoffice/variant'; -// TODO: We are using backend model here, I think we should get our own model: -type ElementTypeModel = UmbContentTypeModel; - +export type UmbBlockDataObjectModel = { + layout: LayoutEntryType; + content: UmbBlockDataType; + settings?: UmbBlockDataType; +}; export abstract class UmbBlockManagerContext< BlockType extends UmbBlockTypeBaseModel = UmbBlockTypeBaseModel, BlockLayoutType extends UmbBlockLayoutBaseModel = UmbBlockLayoutBaseModel, @@ -21,10 +24,13 @@ export abstract class UmbBlockManagerContext< // #contentTypeRepository = new UmbDocumentTypeDetailRepository(this); - #workspacePath = new UmbStringState(undefined); - workspacePath = this.#workspacePath.asObservable(); + #propertyAlias = new UmbStringState(undefined); + propertyAlias = this.#propertyAlias.asObservable(); - #contentTypes = new UmbArrayState(>[], (x) => x.unique); + #variantId = new UmbClassState(undefined); + variantId = this.#variantId.asObservable(); + + #contentTypes = new UmbArrayState(>[], (x) => x.unique); public readonly contentTypes = this.#contentTypes.asObservable(); #blockTypes = new UmbArrayState(>[], (x) => x.contentElementTypeKey); @@ -42,6 +48,16 @@ export abstract class UmbBlockManagerContext< #settings = new UmbArrayState(>[], (x) => x.udi); public readonly settings = this.#settings.asObservable(); + // TODO: maybe its bad to consume Property Context, and instead wire this up manually in the property editor? With these: (and one for variant-id..) + /*setPropertyAlias(alias: string) { + this.#propertyAlias.setValue(alias); + console.log('!!!!!manager got alias: ', alias); + this.#workspaceModal.setUniquePathValue('propertyAlias', alias); + } + getPropertyAlias() { + this.#propertyAlias.value; + }*/ + setEditorConfiguration(configs: UmbPropertyEditorConfigCollection) { this.#editorConfiguration.setValue(configs); } @@ -56,7 +72,6 @@ export abstract class UmbBlockManagerContext< setLayouts(layouts: Array) { this._layouts.setValue(layouts); } - setContents(contents: Array) { this.#contents.setValue(contents); } @@ -67,17 +82,22 @@ export abstract class UmbBlockManagerContext< constructor(host: UmbControllerHost) { super(host, UMB_BLOCK_MANAGER_CONTEXT); - // TODO: This might will need the property alias as part of the URL, to avoid collision if multiple of these Editor on same Node. - // IDEA: Make a Workspace registration controller that can be used to register a workspace, which does both edit and create?. - new UmbModalRouteRegistrationController(this, UMB_BLOCK_WORKSPACE_MODAL) - .addAdditionalPath('block') - .onSetup(() => { - return { data: { entityType: 'block', preset: {} }, modal: { size: 'medium' } }; - }) - .observeRouteBuilder((routeBuilder) => { - const newPath = routeBuilder({}); - this.#workspacePath.setValue(newPath); - }); + this.consumeContext(UMB_PROPERTY_CONTEXT, (propertyContext) => { + this.observe( + propertyContext?.alias, + (alias) => { + this.#propertyAlias.setValue(alias); + }, + 'observePropertyAlias', + ); + this.observe( + propertyContext?.variantId, + (variantId) => { + this.#variantId.setValue(variantId); + }, + 'observePropertyVariantId', + ); + }); } async ensureContentType(unique?: string) { @@ -123,9 +143,9 @@ export abstract class UmbBlockManagerContext< return this.#settings.asObservablePart((source) => source.find((x) => x.udi === udi)); } - setOneLayout(layoutData: BlockLayoutType) { + /*setOneLayout(layoutData: BlockLayoutType) { return this._layouts.appendOne(layoutData); - } + }*/ setOneContent(contentData: UmbBlockDataType) { this.#contents.appendOne(contentData); } @@ -133,73 +153,80 @@ export abstract class UmbBlockManagerContext< this.#settings.appendOne(settingsData); } - abstract _createBlock( - modalData: UmbBlockWorkspaceData, - layoutEntry: Omit, - contentElementTypeKey: string, - ): boolean; + removeOneContent(contentUdi: string) { + this.#contents.removeOne(contentUdi); + } + removeOneSettings(settingsUdi: string) { + this.#settings.removeOne(settingsUdi); + } - public createBlock( - modalData: UmbBlockWorkspaceData, - layoutEntry: Omit, + abstract create( contentElementTypeKey: string, + partialLayoutEntry?: Omit, + modalData?: UmbBlockWorkspaceData, + ): UmbBlockDataObjectModel | undefined; + + protected createBlockData( + contentElementTypeKey: string, + partialLayoutEntry?: Omit, ) { // Find block type. const blockType = this.#blockTypes.value.find((x) => x.contentElementTypeKey === contentElementTypeKey); if (!blockType) { throw new Error(`Cannot create block, missing block type for ${contentElementTypeKey}`); - return false; } // Create layout entry: - const fullLayoutEntry: BlockLayoutType = { + const layout: BlockLayoutType = { contentUdi: buildUdi('element', UmbId.new()), - ...(layoutEntry as Partial), + ...(partialLayoutEntry as Partial), } as BlockLayoutType; + + const content = { + udi: layout.contentUdi, + contentTypeKey: contentElementTypeKey, + }; + let settings: UmbBlockDataType | undefined = undefined; + if (blockType.settingsElementTypeKey) { - fullLayoutEntry.settingsUdi = buildUdi('element', UmbId.new()); + layout.settingsUdi = buildUdi('element', UmbId.new()); + settings = { + udi: layout.settingsUdi, + contentTypeKey: blockType.settingsElementTypeKey, + }; } - if (this._createBlock(modalData, fullLayoutEntry, contentElementTypeKey) === false) { - return false; - } + return { + layout, + content, + settings, + }; + } + abstract insert( + layoutEntry: BlockLayoutType, + content: UmbBlockDataType, + settings: UmbBlockDataType | undefined, + modalData: UmbBlockWorkspaceData, + ): boolean; + + protected insertBlockData( + layoutEntry: BlockLayoutType, + content: UmbBlockDataType, + settings: UmbBlockDataType | undefined, + modalData: ModalDataType, + ) { // Create content entry: - if (fullLayoutEntry.contentUdi) { - this.#contents.appendOne({ - contentTypeKey: contentElementTypeKey, - udi: fullLayoutEntry.contentUdi, - }); + if (layoutEntry.contentUdi) { + this.#contents.appendOne(content); } else { throw new Error('Cannot create block, missing contentUdi'); return false; } //Create settings entry: - if (blockType.settingsElementTypeKey) { - if (fullLayoutEntry.settingsUdi) { - this.#contents.appendOne({ - contentTypeKey: blockType.settingsElementTypeKey, - udi: fullLayoutEntry.settingsUdi, - }); - } else { - throw new Error('Cannot create block, missing settingsUdi'); - return false; - } + if (settings && layoutEntry.settingsUdi) { + this.#settings.appendOne(settings); } - - return true; - } - - deleteBlock(contentUdi: string) { - const layout = this._layouts.value.find((x) => x.contentUdi === contentUdi); - if (!layout) return; - - if (layout.settingsUdi) { - this.#settings.removeOne(layout.settingsUdi); - } - - this._layouts.removeOne(contentUdi); - this.#contents.removeOne(contentUdi); } } diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block/context/index.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/context/index.ts index 689c247d82..2f13512f99 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block/context/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block/context/index.ts @@ -1 +1,6 @@ -export * from './block-entity.context.js'; +export * from './block-entry.context-token.js'; +export * from './block-entry.context.js'; +export * from './block-entries.context-token.js'; +export * from './block-entries.context.js'; +export * from './block-manager.context-token.js'; +export type * from './block-manager.context.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block/index.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/index.ts index abccb4df2a..c056977285 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block/index.ts @@ -1,6 +1,5 @@ export * from './conditions/index.js'; export * from './context/index.js'; -export * from './manager/index.js'; export * from './modals/index.js'; export * from './types.js'; export * from './workspace/index.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block/manager/index.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/manager/index.ts deleted file mode 100644 index 9116a8ebf8..0000000000 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block/manager/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from './block-manager.context-token.js'; -export type * from './block-manager.context.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/block-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/block-workspace-editor.element.ts index ee4e734440..1f543763c9 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/block-workspace-editor.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/block-workspace-editor.element.ts @@ -1,7 +1,7 @@ -import { UMB_BLOCK_WORKSPACE_CONTEXT } from './block-workspace.context-token.js'; +import type { UMB_BLOCK_WORKSPACE_CONTEXT } from './block-workspace.context-token.js'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { customElement, css, html, property } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-block-workspace-editor') export class UmbBlockWorkspaceEditorElement extends UmbLitElement { @@ -11,15 +11,6 @@ export class UmbBlockWorkspaceEditorElement extends UmbLitElement { @property({ type: String, attribute: false }) workspaceAlias?: string; - constructor() { - super(); - - this.consumeContext(UMB_BLOCK_WORKSPACE_CONTEXT, (instance) => { - this.#workspaceContext = instance; - this.#workspaceContext?.content.createPropertyDatasetContext(this); - }); - } - render() { return this.workspaceAlias ? html` ` diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/block-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/block-workspace.context.ts index 327498248a..951e761bcd 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/block-workspace.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/block-workspace.context.ts @@ -1,13 +1,14 @@ -import type { UmbBlockLayoutBaseModel, UmbBlockDataType } from '../types.js'; +import type { UmbBlockDataType, UmbBlockLayoutBaseModel } from '../types.js'; import { UmbBlockElementManager } from './block-element-manager.js'; import { UmbEditableWorkspaceContextBase } from '@umbraco-cms/backoffice/workspace'; import { UmbBooleanState, UmbObjectState, UmbStringState } from '@umbraco-cms/backoffice/observable-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import type { ManifestWorkspace } from '@umbraco-cms/backoffice/extension-registry'; -import { UmbId } from '@umbraco-cms/backoffice/id'; -import type { UmbBlockWorkspaceData } from '@umbraco-cms/backoffice/block'; -import { UMB_BLOCK_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/block'; -import { buildUdi } from '@umbraco-cms/backoffice/utils'; +import { + UMB_BLOCK_ENTRIES_CONTEXT, + UMB_BLOCK_MANAGER_CONTEXT, + type UmbBlockWorkspaceData, +} from '@umbraco-cms/backoffice/block'; import { UMB_MODAL_CONTEXT } from '@umbraco-cms/backoffice/modal'; export type UmbBlockWorkspaceElementManagerNames = 'content' | 'settings'; @@ -21,6 +22,8 @@ export class UmbBlockWorkspaceContext< #blockManager?: typeof UMB_BLOCK_MANAGER_CONTEXT.TYPE; #retrieveBlockManager; + #blockEntries?: typeof UMB_BLOCK_ENTRIES_CONTEXT.TYPE; + #retrieveBlockEntries; #modalContext?: typeof UMB_MODAL_CONTEXT.TYPE; #retrieveModalContext; #editorConfigPromise?: Promise; @@ -32,6 +35,10 @@ export class UmbBlockWorkspaceContext< #liveEditingMode?: boolean; + #initialLayout?: LayoutDataType; + #initialContent?: UmbBlockDataType; + #initialSettings?: UmbBlockDataType; + #layout = new UmbObjectState(undefined); readonly layout = this.#layout.asObservable(); //readonly unique = this.#layout.asObservablePart((x) => x?.contentUdi); @@ -57,26 +64,43 @@ export class UmbBlockWorkspaceContext< this.#retrieveBlockManager = this.consumeContext(UMB_BLOCK_MANAGER_CONTEXT, (context) => { this.#blockManager = context; - this.#editorConfigPromise = this.observe(context.editorConfiguration, (editorConfigs) => { - if (editorConfigs) { - const value = editorConfigs.getValueByAlias('useLiveEditing'); - this.#liveEditingMode = value; - } - }).asPromise(); - // TODO: Observe or just get the LiveEditing setting? + this.#editorConfigPromise = this.observe( + context.editorConfiguration, + (editorConfigs) => { + if (editorConfigs) { + const value = editorConfigs.getValueByAlias('useLiveEditing'); + this.#liveEditingMode = value; + } + }, + 'observeEditorConfig', + ).asPromise(); + }).asPromise(); + + this.#retrieveBlockEntries = this.consumeContext(UMB_BLOCK_ENTRIES_CONTEXT, (context) => { + this.#blockEntries = context; }).asPromise(); } async load(unique: string) { await this.#retrieveBlockManager; + await this.#retrieveBlockEntries; await this.#editorConfigPromise; - if (!this.#blockManager) { + if (!this.#blockManager || !this.#blockEntries) { throw new Error('Block manager not found'); return; } this.observe( - this.#blockManager.layoutOf(unique), + this.#blockEntries.layoutOf(unique), + (layoutData) => { + this.#initialLayout ??= layoutData as LayoutDataType; + this.removeControllerByAlias('observeLayoutInitially'); + }, + 'observeLayoutInitially', + ); + + this.observe( + this.#blockEntries.layoutOf(unique), (layoutData) => { this.#layout.setValue(layoutData as LayoutDataType); @@ -90,6 +114,16 @@ export class UmbBlockWorkspaceContext< }, 'observeContent', ); + if (!this.#initialContent) { + this.observe( + this.#blockManager!.contentOf(contentUdi), + (contentData) => { + this.#initialContent ??= contentData; + this.removeControllerByAlias('observeContentInitially'); + }, + 'observeContentInitially', + ); + } } // Settings: @@ -102,6 +136,16 @@ export class UmbBlockWorkspaceContext< }, 'observeSettings', ); + if (!this.#initialSettings) { + this.observe( + this.#blockManager!.contentOf(settingsUdi), + (settingsData) => { + this.#initialSettings ??= settingsData; + this.removeControllerByAlias('observeSettingsInitially'); + }, + 'observeSettingsInitially', + ); + } } }, 'observeLayout', @@ -113,45 +157,47 @@ export class UmbBlockWorkspaceContext< } async create(contentElementTypeId: string) { - await this.#retrieveBlockManager; + await this.#retrieveBlockEntries; await this.#retrieveModalContext; - if (!this.#blockManager) { - throw new Error('Block Manager not found'); + if (!this.#blockEntries) { + throw new Error('Block Entries not found'); return; } if (!this.#modalContext) { throw new Error('Modal Context not found'); return; } - // - // TODO: Condense this into some kind of create method? - const key = UmbId.new(); - const contentUdi = buildUdi('block', key); - const layoutData: UmbBlockLayoutBaseModel = { - contentUdi: contentUdi, - }; - const contentData: UmbBlockDataType = { - udi: contentUdi, - contentTypeKey: contentElementTypeId, - }; - this.content.setData(contentData); - // TODO: If we have Settings dedicated to this block type, we initiate them here: + // TODO: Missing some way to append more layout data... this could be part of modal data, (or context api?) this.setIsNew(true); - this.#layout.setValue(layoutData as LayoutDataType); + + const blockCreated = await this.#blockEntries.create( + contentElementTypeId, + {}, + this.#modalContext.data as UmbBlockWorkspaceData, + ); + if (!blockCreated) { + throw new Error('Block Entries could not create block'); + } + + this.#layout.setValue(blockCreated.layout as LayoutDataType); + this.content.setData(blockCreated.content); + if (blockCreated.settings) { + this.settings.setData(blockCreated.settings); + } if (this.#liveEditingMode) { - const blockCreated = this.#blockManager.createBlock( + // Insert already, cause we are in live editing mode: + const blockInserted = await this.#blockEntries.insert( + blockCreated.layout, + blockCreated.content, + blockCreated.settings, this.#modalContext.data as UmbBlockWorkspaceData, - layoutData, - contentElementTypeId, ); - if (!blockCreated) { - throw new Error('Block Manager could not create block'); - return; + if (!blockInserted) { + throw new Error('Block Entries could not insert block'); } - this.#establishLiveSync(); } } @@ -159,7 +205,7 @@ export class UmbBlockWorkspaceContext< #establishLiveSync() { this.observe(this.layout, (layoutData) => { if (layoutData) { - this.#blockManager?.setOneLayout(layoutData); + this.#blockEntries?.setOneLayout(layoutData); } }); this.observe(this.content.data, (contentData) => { @@ -220,30 +266,32 @@ export class UmbBlockWorkspaceContext< async save() { const layoutData = this.#layout.value; const contentData = this.content.getData(); - if (!layoutData || !this.#blockManager || !contentData || !this.#modalContext) return; + if (!layoutData || !this.#blockManager || !this.#blockEntries || !contentData || !this.#modalContext) return; + + const settingsData = this.settings.getData(); if (!this.#liveEditingMode) { if (this.getIsNew() === true) { - const blockCreated = this.#blockManager.createBlock( - this.#modalContext.data as UmbBlockWorkspaceData, + // Insert (This means the layout entry will be inserted at the desired location): + const blockInserted = await this.#blockEntries.insert( layoutData, - contentData.contentTypeKey, + contentData, + settingsData, + this.#modalContext.data as UmbBlockWorkspaceData, ); - if (!blockCreated) { - throw new Error('Block Manager could not create block'); - return; + if (!blockInserted) { + throw new Error('Block Entries could not insert block'); } - } + } else { + // Update data: - // TODO: Save the block, but only in non-live-editing mode. - this.#blockManager.setOneLayout(layoutData); - - if (contentData) { - this.#blockManager.setOneContent(contentData); - } - const settingsData = this.settings.getData(); - if (settingsData) { - this.#blockManager.setOneSettings(settingsData); + this.#blockEntries.setOneLayout(layoutData); + if (contentData) { + this.#blockManager.setOneContent(contentData); + } + if (settingsData) { + this.#blockManager.setOneSettings(settingsData); + } } } @@ -258,7 +306,19 @@ export class UmbBlockWorkspaceContext< // Remove the block? const contentUdi = this.#layout.value?.contentUdi; if (contentUdi) { - this.#blockManager?.deleteBlock(contentUdi); + this.#blockEntries?.delete(contentUdi); + } + } else { + // TODO: Revert the layout, content & settings data to the original state. + if (this.#initialLayout) { + console.log('reverted layout'); + this.#blockEntries?.setOneLayout(this.#initialLayout); + } + if (this.#initialContent) { + this.#blockManager?.setOneContent(this.#initialContent); + } + if (this.#initialSettings) { + this.#blockManager?.setOneContent(this.#initialSettings); } } } diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/block-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/block-workspace.element.ts index 5e080011fe..8f37ec7784 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/block-workspace.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/block-workspace.element.ts @@ -3,7 +3,7 @@ import { UmbBlockWorkspaceEditorElement } from './block-workspace-editor.element import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; import type { UmbRoute } from '@umbraco-cms/backoffice/router'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { UmbWorkspaceIsNewRedirectController } from '@umbraco-cms/backoffice/workspace'; import type { UmbApi } from '@umbraco-cms/backoffice/extension-api'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/views/edit/block-workspace-view-edit-no-router.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/views/edit/block-workspace-view-edit-content-no-router.element.ts similarity index 68% rename from src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/views/edit/block-workspace-view-edit-no-router.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/views/edit/block-workspace-view-edit-content-no-router.element.ts index 255dd05e6f..b3d5dce3ed 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/views/edit/block-workspace-view-edit-no-router.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/views/edit/block-workspace-view-edit-content-no-router.element.ts @@ -3,12 +3,17 @@ import './block-workspace-view-edit-tab.element.js'; import { css, html, customElement, state, repeat } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { UmbContentTypeContainerStructureHelper } from '@umbraco-cms/backoffice/content-type'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; -import type { PropertyTypeContainerModelBaseModel } from '@umbraco-cms/backoffice/backend-api'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; +import type { PropertyTypeContainerModelBaseModel } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbWorkspaceViewElement } from '@umbraco-cms/backoffice/extension-registry'; -@customElement('umb-block-workspace-view-edit-no-router') -export class UmbBlockWorkspaceViewEditNoRouterElement extends UmbLitElement implements UmbWorkspaceViewElement { +/** + * @element umb-block-workspace-view-edit-content-no-router + * @description + * A specific view for editing content in a block workspace placed inline within a block view/element. + */ +@customElement('umb-block-workspace-view-edit-content-no-router') +export class UmbBlockWorkspaceViewEditContentNoRouterElement extends UmbLitElement implements UmbWorkspaceViewElement { //private _hasRootProperties = false; @state() @@ -23,16 +28,16 @@ export class UmbBlockWorkspaceViewEditNoRouterElement extends UmbLitElement impl @state() private _activeTabName?: string | null | undefined; - private _workspaceContext?: typeof UMB_BLOCK_WORKSPACE_CONTEXT.TYPE; + #blockWorkspace?: typeof UMB_BLOCK_WORKSPACE_CONTEXT.TYPE; - private _tabsStructureHelper = new UmbContentTypeContainerStructureHelper(this); + #tabsStructureHelper = new UmbContentTypeContainerStructureHelper(this); constructor() { super(); - this._tabsStructureHelper.setIsRoot(true); - this._tabsStructureHelper.setContainerChildType('Tab'); - this.observe(this._tabsStructureHelper.containers, (tabs) => { + this.#tabsStructureHelper.setIsRoot(true); + this.#tabsStructureHelper.setContainerChildType('Tab'); + this.observe(this.#tabsStructureHelper.containers, (tabs) => { this._tabs = tabs; this._checkDefaultTabName(); }); @@ -40,37 +45,37 @@ export class UmbBlockWorkspaceViewEditNoRouterElement extends UmbLitElement impl // _hasRootProperties can be gotten via _tabsStructureHelper.hasProperties. But we do not support root properties currently. this.consumeContext(UMB_BLOCK_WORKSPACE_CONTEXT, (workspaceContext) => { - this._workspaceContext = workspaceContext; - this._tabsStructureHelper.setStructureManager(workspaceContext.content.structure); + this.#blockWorkspace = workspaceContext; + this.#tabsStructureHelper.setStructureManager(workspaceContext.content.structure); + workspaceContext.content.createPropertyDatasetContext(this); this._observeRootGroups(); }); } private _observeRootGroups() { - if (!this._workspaceContext) return; + if (!this.#blockWorkspace) return; this.observe( - this._workspaceContext.content.structure.hasRootContainers('Group'), + this.#blockWorkspace.content.structure.hasRootContainers('Group'), (hasRootGroups) => { this._hasRootGroups = hasRootGroups; this._checkDefaultTabName(); }, - '_observeGroups', + 'observeGroups', ); } private _checkDefaultTabName() { - if (!this._tabs || !this._workspaceContext) return; + if (!this._tabs || !this.#blockWorkspace) return; // Find the default tab to grab: if (this._activeTabId === undefined) { - if (this._tabs.length > 0) { - this._activeTabName = this._tabs[0].name; - this._activeTabId = this._tabs[0].id; - } if (this._hasRootGroups) { this._activeTabName = null; this._activeTabId = null; + } else if (this._tabs.length > 0) { + this._activeTabName = this._tabs[0].name; + this._activeTabId = this._tabs[0].id; } } } @@ -111,10 +116,11 @@ export class UmbBlockWorkspaceViewEditNoRouterElement extends UmbLitElement impl : ''} ${this._activeTabId !== undefined ? html` ` @@ -134,10 +140,10 @@ export class UmbBlockWorkspaceViewEditNoRouterElement extends UmbLitElement impl ]; } -export default UmbBlockWorkspaceViewEditNoRouterElement; +export default UmbBlockWorkspaceViewEditContentNoRouterElement; declare global { interface HTMLElementTagNameMap { - 'umb-block-workspace-view-edit-no-router': UmbBlockWorkspaceViewEditNoRouterElement; + 'umb-block-workspace-view-edit-content-no-router': UmbBlockWorkspaceViewEditContentNoRouterElement; } } diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/views/edit/block-workspace-view-edit-properties.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/views/edit/block-workspace-view-edit-properties.element.ts index d35fa40231..0b587587ed 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/views/edit/block-workspace-view-edit-properties.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/views/edit/block-workspace-view-edit-properties.element.ts @@ -8,7 +8,7 @@ import type { UmbPropertyTypeModel, } from '@umbraco-cms/backoffice/content-type'; import { UmbContentTypePropertyStructureHelper } from '@umbraco-cms/backoffice/content-type'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-block-workspace-view-edit-properties') export class UmbBlockWorkspaceViewEditPropertiesElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/views/edit/block-workspace-view-edit-tab.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/views/edit/block-workspace-view-edit-tab.element.ts index 03a27f78bc..c788c7ec28 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/views/edit/block-workspace-view-edit-tab.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/views/edit/block-workspace-view-edit-tab.element.ts @@ -3,8 +3,8 @@ import { css, html, customElement, property, state, repeat } from '@umbraco-cms/ import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import type { UmbContentTypeModel } from '@umbraco-cms/backoffice/content-type'; import { UmbContentTypeContainerStructureHelper } from '@umbraco-cms/backoffice/content-type'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; -import type { PropertyTypeContainerModelBaseModel } from '@umbraco-cms/backoffice/backend-api'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; +import type { PropertyTypeContainerModelBaseModel } from '@umbraco-cms/backoffice/external/backend-api'; import './block-workspace-view-edit-properties.element.js'; // eslint-disable-next-line import/order diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/views/edit/block-workspace-view-edit.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/views/edit/block-workspace-view-edit.element.ts index 620007696a..54edca4e75 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/views/edit/block-workspace-view-edit.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/views/edit/block-workspace-view-edit.element.ts @@ -7,8 +7,8 @@ import type { UmbContentTypeModel } from '@umbraco-cms/backoffice/content-type'; import { UmbContentTypeContainerStructureHelper } from '@umbraco-cms/backoffice/content-type'; import type { UmbRoute, UmbRouterSlotChangeEvent, UmbRouterSlotInitEvent } from '@umbraco-cms/backoffice/router'; import { encodeFolderName } from '@umbraco-cms/backoffice/router'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; -import type { PropertyTypeContainerModelBaseModel } from '@umbraco-cms/backoffice/backend-api'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; +import type { PropertyTypeContainerModelBaseModel } from '@umbraco-cms/backoffice/external/backend-api'; import type { ManifestWorkspaceView, UmbWorkspaceViewElement } from '@umbraco-cms/backoffice/extension-registry'; @customElement('umb-block-workspace-view-edit') @@ -59,7 +59,11 @@ export class UmbBlockWorkspaceViewEditElement extends UmbLitElement implements U #setStructureManager() { if (!this.#blockWorkspace || !this.#managerName) return; - this.#tabsStructureHelper.setStructureManager(this.#blockWorkspace[this.#managerName].structure); + const dataManager = this.#blockWorkspace[this.#managerName]; + this.#tabsStructureHelper.setStructureManager(dataManager.structure); + + // Create Data Set: + dataManager.createPropertyDatasetContext(this); this.observe( this.#blockWorkspace![this.#managerName!].structure.hasRootContainers('Group'), diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/collection/action/collection-action-button.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/collection/action/collection-action-button.element.ts index 8ec442acac..529e5e0fd8 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/collection/action/collection-action-button.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/collection/action/collection-action-button.element.ts @@ -2,7 +2,7 @@ import type { UmbCollectionAction } from './collection-action-base.js'; import { UmbActionExecutedEvent } from '@umbraco-cms/backoffice/event'; import { html, customElement, property, state, ifDefined } from '@umbraco-cms/backoffice/external/lit'; import type { UUIButtonState } from '@umbraco-cms/backoffice/external/uui'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; import type { UmbBackofficeManifestKind, ManifestCollectionAction } from '@umbraco-cms/backoffice/extension-registry'; import { createExtensionApi } from '@umbraco-cms/backoffice/extension-api'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/collection/collection.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/collection/collection.element.ts index 026df04cdd..e5eca4bf4a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/collection/collection.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/collection/collection.element.ts @@ -1,6 +1,6 @@ import type { UmbCollectionContext } from './types.js'; import { customElement, html, property, state } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { ManifestCollection } from '@umbraco-cms/backoffice/extension-registry'; import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; import { createExtensionApi, createExtensionElement } from '@umbraco-cms/backoffice/extension-api'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/collection/components/collection-action-bundle.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/collection/components/collection-action-bundle.element.ts index 54d202153a..b9e64f5325 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/collection/components/collection-action-bundle.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/collection/components/collection-action-bundle.element.ts @@ -2,7 +2,7 @@ import type { UmbDefaultCollectionContext } from '../default/collection-default. import { UMB_DEFAULT_COLLECTION_CONTEXT } from '../default/collection-default.context.js'; import { html, customElement, state, nothing } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-collection-action-bundle') export class UmbCollectionActionBundleElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/collection/components/collection-selection-actions.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/collection/components/collection-selection-actions.element.ts index 5555c83190..23297d01f3 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/collection/components/collection-selection-actions.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/collection/components/collection-selection-actions.element.ts @@ -2,7 +2,7 @@ import { UMB_DEFAULT_COLLECTION_CONTEXT } from '../default/collection-default.co import type { UmbActionExecutedEvent } from '@umbraco-cms/backoffice/event'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { css, html, nothing, customElement, state } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-collection-selection-actions') export class UmbCollectionSelectionActionsElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/collection/components/collection-toolbar.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/collection/components/collection-toolbar.element.ts index 46338b1aef..e13e76486a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/collection/components/collection-toolbar.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/collection/components/collection-toolbar.element.ts @@ -1,6 +1,6 @@ import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { css, html, customElement } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-collection-toolbar') export class UmbCollectionToolbarElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/collection/components/collection-view-bundle.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/collection/components/collection-view-bundle.element.ts index c9d61c8325..774621a390 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/collection/components/collection-view-bundle.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/collection/components/collection-view-bundle.element.ts @@ -3,7 +3,7 @@ import { UMB_DEFAULT_COLLECTION_CONTEXT } from '../default/collection-default.co import type { ManifestCollectionView } from '../../extension-registry/models/collection-view.model.js'; import { css, html, customElement, state, nothing } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-collection-view-bundle') export class UmbCollectionViewBundleElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/collection/components/pagination/collection-pagination.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/collection/components/pagination/collection-pagination.element.ts index be50ffb9b3..e30a056762 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/collection/components/pagination/collection-pagination.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/collection/components/pagination/collection-pagination.element.ts @@ -3,7 +3,7 @@ import type { UUIPaginationEvent } from '@umbraco-cms/backoffice/external/uui'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { css, html, customElement, nothing, state } from '@umbraco-cms/backoffice/external/lit'; import type { UmbDefaultCollectionContext } from '@umbraco-cms/backoffice/collection'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-collection-pagination') export class UmbCollectionPaginationElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/collection/dashboards/dashboard-collection.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/collection/dashboards/dashboard-collection.element.ts index 78fbceb09f..3b8f293864 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/collection/dashboards/dashboard-collection.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/collection/dashboards/dashboard-collection.element.ts @@ -1,6 +1,6 @@ import { css, html, customElement } from '@umbraco-cms/backoffice/external/lit'; import type { ManifestDashboardCollection } from '@umbraco-cms/backoffice/extension-registry'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-dashboard-collection') export class UmbDashboardCollectionElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/collection/default/collection-default.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/collection/default/collection-default.element.ts index 46220165f4..d97aa8407a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/collection/default/collection-default.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/collection/default/collection-default.element.ts @@ -3,7 +3,7 @@ import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; import type { UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbRoute } from '@umbraco-cms/backoffice/router'; const manifest: UmbBackofficeManifestKind = { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/backoffice-modal-container/backoffice-modal-container.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/backoffice-modal-container/backoffice-modal-container.element.ts index 702763c78b..f56ca854f6 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/components/backoffice-modal-container/backoffice-modal-container.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/backoffice-modal-container/backoffice-modal-container.element.ts @@ -3,7 +3,7 @@ import type { CSSResultGroup } from '@umbraco-cms/backoffice/external/lit'; import { css, html, repeat, customElement, state, nothing } from '@umbraco-cms/backoffice/external/lit'; import type { UmbModalManagerContext, UmbModalContext } from '@umbraco-cms/backoffice/modal'; import { UMB_MODAL_MANAGER_CONTEXT, UmbModalElement } from '@umbraco-cms/backoffice/modal'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-backoffice-modal-container') export class UmbBackofficeModalContainerElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/backoffice-notification-container/backoffice-notification-container.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/backoffice-notification-container/backoffice-notification-container.element.ts index 07bbf076ea..ee8fa9c443 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/components/backoffice-notification-container/backoffice-notification-container.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/backoffice-notification-container/backoffice-notification-container.element.ts @@ -3,7 +3,7 @@ import type { CSSResultGroup } from '@umbraco-cms/backoffice/external/lit'; import { css, html, customElement, state, repeat, query } from '@umbraco-cms/backoffice/external/lit'; import type { UmbNotificationHandler, UmbNotificationContext } from '@umbraco-cms/backoffice/notification'; import { UMB_NOTIFICATION_CONTEXT } from '@umbraco-cms/backoffice/notification'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-backoffice-notification-container') export class UmbBackofficeNotificationContainerElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/dropdown/dropdown.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/dropdown/dropdown.element.ts index dc38b830b1..94d0ac4477 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/components/dropdown/dropdown.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/dropdown/dropdown.element.ts @@ -7,7 +7,7 @@ import type { import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import type { PropertyValueMap } from '@umbraco-cms/backoffice/external/lit'; import { css, html, customElement, property, query, when } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; // TODO: maybe move this to UI Library. @customElement('umb-dropdown') diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/entity-actions-bundle/entity-actions-bundle.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/entity-actions-bundle/entity-actions-bundle.element.ts index 3de9b99748..571998186a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/components/entity-actions-bundle/entity-actions-bundle.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/entity-actions-bundle/entity-actions-bundle.element.ts @@ -3,7 +3,7 @@ import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { map } from '@umbraco-cms/backoffice/external/rxjs'; import type { UmbSectionSidebarContext } from '@umbraco-cms/backoffice/section'; import { UMB_SECTION_SIDEBAR_CONTEXT } from '@umbraco-cms/backoffice/section'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; @customElement('umb-entity-actions-bundle') diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/extension-slot/extension-slot.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/extension-slot/extension-slot.element.ts index 155ab0333d..eb49738b3c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/components/extension-slot/extension-slot.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/extension-slot/extension-slot.element.ts @@ -5,7 +5,7 @@ import { type UmbExtensionElementInitializer, UmbExtensionsElementInitializer, } from '@umbraco-cms/backoffice/extension-api'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; /** * @element umb-extension-slot diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/history/history-item.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/history/history-item.element.ts index e9f696d443..f7f46543d5 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/components/history/history-item.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/history/history-item.element.ts @@ -1,7 +1,7 @@ import { UMB_APP_CONTEXT } from '@umbraco-cms/backoffice/app'; import { css, html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-history-item') export class UmbHistoryItemElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/history/history-list.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/history/history-list.element.ts index f27dc407be..63aad518b6 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/components/history/history-list.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/history/history-list.element.ts @@ -1,6 +1,6 @@ import { css, html, customElement } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-history-list') export class UmbHistoryListElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-color/input-color.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-color/input-color.element.ts index 23a80ff85b..c5fe788fc2 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-color/input-color.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-color/input-color.element.ts @@ -1,7 +1,7 @@ import { html, customElement, property } from '@umbraco-cms/backoffice/external/lit'; import type { UUIColorSwatchesEvent } from '@umbraco-cms/backoffice/external/uui'; import { FormControlMixin } from '@umbraco-cms/backoffice/external/uui'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbSwatchDetails } from '@umbraco-cms/backoffice/models'; /* @@ -32,10 +32,9 @@ export class UmbInputColorElement extends FormControlMixin(UmbLitElement) { render() { return html` - ${this._renderColors()} + ${this._renderColors()} `; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-date/input-date.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-date/input-date.element.ts index 00fcb6368f..9331038dcf 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-date/input-date.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-date/input-date.element.ts @@ -2,7 +2,7 @@ import { UmbConfigRepository } from '../../repository/config/config.repository.j import { css, html, ifDefined, customElement, property, state } from '@umbraco-cms/backoffice/external/lit'; import type { UUIInputEvent } from '@umbraco-cms/backoffice/external/uui'; import { FormControlMixin } from '@umbraco-cms/backoffice/external/uui'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-input-date') export class UmbInputDateElement extends FormControlMixin(UmbLitElement) { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-dropdown/input-dropdown-list.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-dropdown/input-dropdown-list.element.ts index f8e43a7634..f876a1cabd 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-dropdown/input-dropdown-list.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-dropdown/input-dropdown-list.element.ts @@ -1,7 +1,7 @@ import { css, html, customElement, property, query } from '@umbraco-cms/backoffice/external/lit'; import type { UUISelectEvent } from '@umbraco-cms/backoffice/external/uui'; import { FormControlMixin } from '@umbraco-cms/backoffice/external/uui'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-input-dropdown-list') export class UmbInputDropdownListElement extends FormControlMixin(UmbLitElement) { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-eye-dropper/input-eye-dropper.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-eye-dropper/input-eye-dropper.element.ts index b6dd9ca20f..e036b91884 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-eye-dropper/input-eye-dropper.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-eye-dropper/input-eye-dropper.element.ts @@ -1,7 +1,7 @@ import { css, html, customElement, property } from '@umbraco-cms/backoffice/external/lit'; import type { UUIColorPickerChangeEvent } from '@umbraco-cms/backoffice/external/uui'; import { FormControlMixin } from '@umbraco-cms/backoffice/external/uui'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-input-eye-dropper') export class UmbInputEyeDropperElement extends FormControlMixin(UmbLitElement) { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-list-base/input-list-base.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-list-base/input-list-base.ts index 969ccc4a50..d0cc7b9aaa 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-list-base/input-list-base.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-list-base/input-list-base.ts @@ -4,11 +4,10 @@ import type { UmbModalManagerContext, UmbModalToken, UmbModalType, - UmbPickerModalValue} from '@umbraco-cms/backoffice/modal'; -import { - UMB_MODAL_MANAGER_CONTEXT + UmbPickerModalValue, } from '@umbraco-cms/backoffice/modal'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; /** TODO: Make use of UUI FORM Mixin, to make it easily take part of a form. */ export class UmbInputListBaseElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-markdown-editor/input-markdown.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-markdown-editor/input-markdown.element.ts index e0bf0b82ff..a1db1bc3f9 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-markdown-editor/input-markdown.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-markdown-editor/input-markdown.element.ts @@ -6,7 +6,7 @@ import { loadCodeEditor } from '@umbraco-cms/backoffice/code-editor'; import { css, html, customElement, query, property, unsafeHTML, when } from '@umbraco-cms/backoffice/external/lit'; import { FormControlMixin, type UUIModalSidebarSize } from '@umbraco-cms/backoffice/external/uui'; import { UmbBooleanState } from '@umbraco-cms/backoffice/observable-api'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbModalManagerContext } from '@umbraco-cms/backoffice/modal'; import { UMB_LINK_PICKER_MODAL, diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-multi-url/input-multi-url.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-multi-url/input-multi-url.element.ts index 105c52c291..6b678cc7a7 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-multi-url/input-multi-url.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-multi-url/input-multi-url.element.ts @@ -1,7 +1,7 @@ import { css, html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit'; import { FormControlMixin } from '@umbraco-cms/backoffice/external/uui'; import type { UUIModalSidebarSize } from '@umbraco-cms/backoffice/external/uui'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbVariantId } from '@umbraco-cms/backoffice/variant'; import { UMB_LINK_PICKER_MODAL, UmbModalRouteRegistrationController } from '@umbraco-cms/backoffice/modal'; import type { UmbModalRouteBuilder, UmbLinkPickerLink } from '@umbraco-cms/backoffice/modal'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-number-range/input-number-range.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-number-range/input-number-range.element.ts index 37fadc0063..d22ec8280d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-number-range/input-number-range.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-number-range/input-number-range.element.ts @@ -1,6 +1,6 @@ import { css, html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit'; import { FormControlMixin } from '@umbraco-cms/backoffice/external/uui'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; function getNumberOrUndefined(value: string) { const num = parseInt(value, 10); diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-radio-button-list/input-radio-button-list.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-radio-button-list/input-radio-button-list.element.ts index 62965e3b29..8c0bb4f7ed 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-radio-button-list/input-radio-button-list.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-radio-button-list/input-radio-button-list.element.ts @@ -1,7 +1,7 @@ import { css, html, nothing, repeat, customElement, property } from '@umbraco-cms/backoffice/external/lit'; import type { UUIBooleanInputEvent } from '@umbraco-cms/backoffice/external/uui'; import { FormControlMixin } from '@umbraco-cms/backoffice/external/uui'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-input-radio-button-list') export class UmbInputRadioButtonListElement extends FormControlMixin(UmbLitElement) { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-slider/input-slider.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-slider/input-slider.element.ts index aff0bf4aae..2c2f216e14 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-slider/input-slider.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-slider/input-slider.element.ts @@ -1,7 +1,7 @@ import { css, html, customElement, property } from '@umbraco-cms/backoffice/external/lit'; import type { UUISliderEvent } from '@umbraco-cms/backoffice/external/uui'; import { FormControlMixin } from '@umbraco-cms/backoffice/external/uui'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-input-slider') export class UmbInputSliderElement extends FormControlMixin(UmbLitElement) { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-tiny-mce/input-tiny-mce.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-tiny-mce/input-tiny-mce.element.ts index 9546f892b6..a7594ac3a4 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-tiny-mce/input-tiny-mce.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-tiny-mce/input-tiny-mce.element.ts @@ -11,7 +11,7 @@ import type { PropertyValueMap } from '@umbraco-cms/backoffice/external/lit'; import { css, customElement, html, property, query, state } from '@umbraco-cms/backoffice/external/lit'; import { firstValueFrom } from '@umbraco-cms/backoffice/external/rxjs'; import { UmbMediaHelper } from '@umbraco-cms/backoffice/utils'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor'; import { UMB_APP_CONTEXT } from '@umbraco-cms/backoffice/app'; import { UmbStylesheetDetailRepository, UmbStylesheetRuleManager } from '@umbraco-cms/backoffice/stylesheet'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-toggle/input-toggle.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-toggle/input-toggle.element.ts index c4417ca01c..b2a8579b1f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-toggle/input-toggle.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-toggle/input-toggle.element.ts @@ -1,7 +1,7 @@ import { css, html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit'; import type { UUIBooleanInputEvent } from '@umbraco-cms/backoffice/external/uui'; import { FormControlMixin } from '@umbraco-cms/backoffice/external/uui'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-input-toggle') export class UmbInputToggleElement extends FormControlMixin(UmbLitElement) { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-tree-picker-source/input-tree-picker-source.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-tree-picker-source/input-tree-picker-source.element.ts index 0669271702..cbbae5a775 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-tree-picker-source/input-tree-picker-source.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-tree-picker-source/input-tree-picker-source.element.ts @@ -2,7 +2,7 @@ import type { UmbInputDocumentRootPickerElement } from '@umbraco-cms/backoffice/ import { html, customElement, property, css, state, nothing } from '@umbraco-cms/backoffice/external/lit'; import type { UUISelectEvent } from '@umbraco-cms/backoffice/external/uui'; import { FormControlMixin } from '@umbraco-cms/backoffice/external/uui'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { UmbChangeEvent } from '@umbraco-cms/backoffice/event'; export type UmbTreePickerSource = { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-upload-field/input-upload-field-file.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-upload-field/input-upload-field-file.element.ts index 1a41cf38c1..879fdf500f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-upload-field/input-upload-field-file.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-upload-field/input-upload-field-file.element.ts @@ -1,6 +1,6 @@ import { UMB_APP_CONTEXT } from '@umbraco-cms/backoffice/app'; import { html, until, customElement, property } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; type FileItem = { name: string; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-upload-field/input-upload-field.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-upload-field/input-upload-field.element.ts index 6db10a4b8e..60a38fa977 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-upload-field/input-upload-field.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-upload-field/input-upload-field.element.ts @@ -1,4 +1,4 @@ -import type { TemporaryFileQueueItem} from '../../temporary-file/temporary-file-manager.class.js'; +import type { TemporaryFileQueueItem } from '../../temporary-file/temporary-file-manager.class.js'; import { UmbTemporaryFileManager } from '../../temporary-file/temporary-file-manager.class.js'; import { UmbId } from '@umbraco-cms/backoffice/id'; import { @@ -14,7 +14,7 @@ import { } from '@umbraco-cms/backoffice/external/lit'; import { FormControlMixin } from '@umbraco-cms/backoffice/external/uui'; import type { UUIFileDropzoneElement, UUIFileDropzoneEvent } from '@umbraco-cms/backoffice/external/uui'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import './input-upload-field-file.element.js'; import { UmbChangeEvent } from '@umbraco-cms/backoffice/event'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/multiple-color-picker-input/multiple-color-picker-input.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/multiple-color-picker-input/multiple-color-picker-input.element.ts index 95f27e1e55..55f0a8a337 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/components/multiple-color-picker-input/multiple-color-picker-input.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/multiple-color-picker-input/multiple-color-picker-input.element.ts @@ -12,7 +12,7 @@ import { } from '@umbraco-cms/backoffice/external/lit'; import { FormControlMixin } from '@umbraco-cms/backoffice/external/uui'; import { type UmbInputEvent, UmbChangeEvent, type UmbDeleteEvent } from '@umbraco-cms/backoffice/event'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { type UmbSorterConfig, UmbSorterController } from '@umbraco-cms/backoffice/sorter'; import { UMB_PROPERTY_DATASET_CONTEXT } from '@umbraco-cms/backoffice/property'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/multiple-color-picker-input/multiple-color-picker-item-input.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/multiple-color-picker-input/multiple-color-picker-item-input.element.ts index df68e8c44a..ad85c0695d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/components/multiple-color-picker-input/multiple-color-picker-item-input.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/multiple-color-picker-input/multiple-color-picker-item-input.element.ts @@ -1,15 +1,10 @@ import { css, html, nothing, customElement, property, query, ifDefined } from '@umbraco-cms/backoffice/external/lit'; -import type { - UUIColorPickerElement, - UUIInputElement, - UUIInputEvent} from '@umbraco-cms/backoffice/external/uui'; -import { - FormControlMixin -} from '@umbraco-cms/backoffice/external/uui'; -import type { UmbModalManagerContext} from '@umbraco-cms/backoffice/modal'; +import type { UUIColorPickerElement, UUIInputElement, UUIInputEvent } from '@umbraco-cms/backoffice/external/uui'; +import { FormControlMixin } from '@umbraco-cms/backoffice/external/uui'; +import type { UmbModalManagerContext } from '@umbraco-cms/backoffice/modal'; import { UMB_MODAL_MANAGER_CONTEXT, UMB_CONFIRM_MODAL } from '@umbraco-cms/backoffice/modal'; import { UmbChangeEvent, UmbInputEvent, UmbDeleteEvent } from '@umbraco-cms/backoffice/event'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; /** * @element umb-multiple-color-picker-item-input diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/multiple-text-string-input/input-multiple-text-string-item.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/multiple-text-string-input/input-multiple-text-string-item.element.ts index f3d8f7c811..ef72181645 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/components/multiple-text-string-input/input-multiple-text-string-item.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/multiple-text-string-input/input-multiple-text-string-item.element.ts @@ -1,10 +1,10 @@ import { css, html, nothing, customElement, property, query } from '@umbraco-cms/backoffice/external/lit'; import type { UUIInputElement, UUIInputEvent } from '@umbraco-cms/backoffice/external/uui'; import { FormControlMixin } from '@umbraco-cms/backoffice/external/uui'; -import type { UmbModalManagerContext} from '@umbraco-cms/backoffice/modal'; +import type { UmbModalManagerContext } from '@umbraco-cms/backoffice/modal'; import { UMB_MODAL_MANAGER_CONTEXT, UMB_CONFIRM_MODAL } from '@umbraco-cms/backoffice/modal'; import { UmbChangeEvent, UmbInputEvent, UmbDeleteEvent } from '@umbraco-cms/backoffice/event'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; /** * @element umb-input-multiple-text-string-item diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/multiple-text-string-input/input-multiple-text-string.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/multiple-text-string-input/input-multiple-text-string.element.ts index 7945201ca9..996b992a0b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/components/multiple-text-string-input/input-multiple-text-string.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/multiple-text-string-input/input-multiple-text-string.element.ts @@ -3,7 +3,7 @@ import { css, html, nothing, repeat, customElement, property, state } from '@umb import { FormControlMixin } from '@umbraco-cms/backoffice/external/uui'; import type { UmbInputEvent, UmbDeleteEvent } from '@umbraco-cms/backoffice/event'; import { UmbChangeEvent } from '@umbraco-cms/backoffice/event'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbSorterConfig } from '@umbraco-cms/backoffice/sorter'; import { UmbSorterController } from '@umbraco-cms/backoffice/sorter'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/popover-layout/popover-layout.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/popover-layout/popover-layout.element.ts index e4aeea45b7..f98d610595 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/components/popover-layout/popover-layout.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/popover-layout/popover-layout.element.ts @@ -1,6 +1,6 @@ import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { css, html, customElement } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; // TODO: maybe move this to UI Library. // TODO: add overwrites for customization. diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/components/property-type-based-property/property-type-based-property.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/components/property-type-based-property/property-type-based-property.element.ts index c39ec41e89..96896bf18b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/components/property-type-based-property/property-type-based-property.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/components/property-type-based-property/property-type-based-property.element.ts @@ -4,7 +4,7 @@ import type { UmbDataTypeDetailModel } from '@umbraco-cms/backoffice/data-type'; import { UmbDataTypeDetailRepository } from '@umbraco-cms/backoffice/data-type'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { css, html, ifDefined, customElement, property, state } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbObserverController } from '@umbraco-cms/backoffice/observable-api'; import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; @customElement('umb-property-type-based-property') diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/structure/content-type-structure-server-data-source-base.ts b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/structure/content-type-structure-server-data-source-base.ts index 8fe1c98834..1afffa33aa 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/structure/content-type-structure-server-data-source-base.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/structure/content-type-structure-server-data-source-base.ts @@ -1,6 +1,6 @@ import type { UmbPagedModel } from '../../repository/data-source/types.js'; import type { UmbContentTypeStructureDataSource } from './content-type-structure-data-source.interface.js'; -import type { AllowedContentTypeModel, ItemResponseModelBaseModel } from '@umbraco-cms/backoffice/backend-api'; +import type { AllowedContentTypeModel, ItemResponseModelBaseModel } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/types.ts b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/types.ts index 0c953ace34..7a5decfceb 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/types.ts @@ -2,7 +2,7 @@ import type { CompositionTypeModel, PropertyTypeModelBaseModel, ReferenceByIdModel, -} from '@umbraco-cms/backoffice/backend-api'; +} from '@umbraco-cms/backoffice/external/backend-api'; export type UmbPropertyContainerTypes = 'Group' | 'Tab'; export interface UmbPropertyTypeContainerModel { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/culture/components/input-culture-select/input-culture-select.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/culture/components/input-culture-select/input-culture-select.element.ts index b549b7b247..82e6de0d2c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/culture/components/input-culture-select/input-culture-select.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/culture/components/input-culture-select/input-culture-select.element.ts @@ -3,8 +3,8 @@ import { UmbChangeEvent } from '@umbraco-cms/backoffice/event'; import { html, repeat, ifDefined, customElement, property, state } from '@umbraco-cms/backoffice/external/lit'; import type { UUIComboboxElement, UUIComboboxEvent } from '@umbraco-cms/backoffice/external/uui'; import { FormControlMixin } from '@umbraco-cms/backoffice/external/uui'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; -import type { CultureReponseModel } from '@umbraco-cms/backoffice/backend-api'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; +import type { CultureReponseModel } from '@umbraco-cms/backoffice/external/backend-api'; @customElement('umb-input-culture-select') export class UmbInputCultureSelectElement extends FormControlMixin(UmbLitElement) { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/culture/repository/sources/culture.server.data.ts b/src/Umbraco.Web.UI.Client/src/packages/core/culture/repository/sources/culture.server.data.ts index 980f6b8f2f..d7cca0cc46 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/culture/repository/sources/culture.server.data.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/culture/repository/sources/culture.server.data.ts @@ -1,5 +1,5 @@ import type { UmbCultureDataSource } from './index.js'; -import { CultureResource } from '@umbraco-cms/backoffice/backend-api'; +import { CultureResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/culture/repository/sources/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/culture/repository/sources/index.ts index b853e38f36..79c6d87767 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/culture/repository/sources/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/culture/repository/sources/index.ts @@ -1,4 +1,4 @@ -import type { PagedCultureReponseModel } from '@umbraco-cms/backoffice/backend-api'; +import type { PagedCultureReponseModel } from '@umbraco-cms/backoffice/external/backend-api'; import type { DataSourceResponse } from '@umbraco-cms/backoffice/repository'; // TODO: This is a temporary solution until we have a proper paging interface diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/components/data-type-flow-input/data-type-flow-input.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/data-type/components/data-type-flow-input/data-type-flow-input.element.ts index 003d2a8fb3..e8bd5cb161 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/components/data-type-flow-input/data-type-flow-input.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/data-type/components/data-type-flow-input/data-type-flow-input.element.ts @@ -1,7 +1,7 @@ import { UMB_DATATYPE_WORKSPACE_MODAL } from '../../index.js'; import { css, html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit'; import { FormControlMixin } from '@umbraco-cms/backoffice/external/uui'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { UmbModalRouteRegistrationController, UMB_DATA_TYPE_PICKER_FLOW_MODAL } from '@umbraco-cms/backoffice/modal'; import { UmbChangeEvent } from '@umbraco-cms/backoffice/event'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/components/data-type-input/data-type-input.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/data-type/components/data-type-input/data-type-input.element.ts index d559781638..0e5a56aa80 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/components/data-type-input/data-type-input.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/data-type/components/data-type-input/data-type-input.element.ts @@ -2,7 +2,7 @@ import type { UmbDataTypeItemModel } from '../../repository/item/types.js'; import { UmbDataTypePickerContext } from './data-type-input.context.js'; import { css, html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit'; import { FormControlMixin } from '@umbraco-cms/backoffice/external/uui'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { splitStringToArray } from '@umbraco-cms/backoffice/utils'; @customElement('umb-data-type-input') diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/components/property-editor-config/property-editor-config.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/data-type/components/property-editor-config/property-editor-config.element.ts index ec26e759c7..f5448334f3 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/components/property-editor-config/property-editor-config.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/data-type/components/property-editor-config/property-editor-config.element.ts @@ -1,7 +1,7 @@ import { html, customElement, state, ifDefined, repeat } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import type { PropertyEditorConfigProperty } from '@umbraco-cms/backoffice/extension-registry'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { UMB_DATA_TYPE_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/data-type'; /** diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/repository/copy/data-type-copy.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/core/data-type/repository/copy/data-type-copy.server.data-source.ts index 9764350446..e066526440 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/repository/copy/data-type-copy.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/data-type/repository/copy/data-type-copy.server.data-source.ts @@ -1,4 +1,4 @@ -import { DataTypeResource } from '@umbraco-cms/backoffice/backend-api'; +import { DataTypeResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; import type { UmbCopyDataSource } from '@umbraco-cms/backoffice/repository'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/repository/detail/data-type-detail.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/core/data-type/repository/detail/data-type-detail.server.data-source.ts index a91df7eb0e..9b426af2d8 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/repository/detail/data-type-detail.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/data-type/repository/detail/data-type-detail.server.data-source.ts @@ -2,8 +2,8 @@ import type { UmbDataTypeDetailModel, UmbDataTypePropertyModel } from '../../typ import { UMB_DATA_TYPE_ENTITY_TYPE } from '../../entity.js'; import { UmbId } from '@umbraco-cms/backoffice/id'; import type { UmbDetailDataSource } from '@umbraco-cms/backoffice/repository'; -import type { CreateDataTypeRequestModel, DataTypeModelBaseModel } from '@umbraco-cms/backoffice/backend-api'; -import { DataTypeResource } from '@umbraco-cms/backoffice/backend-api'; +import type { CreateDataTypeRequestModel, DataTypeModelBaseModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { DataTypeResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/repository/item/data-type-item.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/core/data-type/repository/item/data-type-item.server.data-source.ts index 9906c5753f..d2963a59c1 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/repository/item/data-type-item.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/data-type/repository/item/data-type-item.server.data-source.ts @@ -1,7 +1,7 @@ import type { UmbDataTypeItemModel } from './types.js'; import { UmbItemServerDataSourceBase } from '@umbraco-cms/backoffice/repository'; -import type { DataTypeItemResponseModel } from '@umbraco-cms/backoffice/backend-api'; -import { DataTypeResource } from '@umbraco-cms/backoffice/backend-api'; +import type { DataTypeItemResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { DataTypeResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; /** diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/repository/move/data-type-move.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/core/data-type/repository/move/data-type-move.server.data-source.ts index 22cf555288..bcbe3a9b25 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/repository/move/data-type-move.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/data-type/repository/move/data-type-move.server.data-source.ts @@ -1,4 +1,4 @@ -import { DataTypeResource } from '@umbraco-cms/backoffice/backend-api'; +import { DataTypeResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; import type { UmbMoveDataSource } from '@umbraco-cms/backoffice/repository'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/tree/data-type-tree.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/core/data-type/tree/data-type-tree.server.data-source.ts index 7de389a906..cd7d0e88bc 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/tree/data-type-tree.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/data-type/tree/data-type-tree.server.data-source.ts @@ -1,7 +1,7 @@ import type { UmbDataTypeTreeItemModel } from './types.js'; import { UmbTreeServerDataSourceBase } from '@umbraco-cms/backoffice/tree'; -import type { DataTypeTreeItemResponseModel } from '@umbraco-cms/backoffice/backend-api'; -import { DataTypeResource } from '@umbraco-cms/backoffice/backend-api'; +import type { DataTypeTreeItemResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { DataTypeResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; /** diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/tree/folder/data-type-folder.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/core/data-type/tree/folder/data-type-folder.server.data-source.ts index 89004b31bf..aac1c20ae9 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/tree/folder/data-type-folder.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/data-type/tree/folder/data-type-folder.server.data-source.ts @@ -1,5 +1,5 @@ import type { UmbCreateFolderModel, UmbFolderDataSource, UmbUpdateFolderModel } from '@umbraco-cms/backoffice/tree'; -import { DataTypeResource } from '@umbraco-cms/backoffice/backend-api'; +import { DataTypeResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/workspace/data-type-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/data-type/workspace/data-type-workspace-editor.element.ts index e590ce02e2..bd13a0cb55 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/workspace/data-type-workspace-editor.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/data-type/workspace/data-type-workspace-editor.element.ts @@ -1,8 +1,8 @@ import { UMB_DATA_TYPE_WORKSPACE_CONTEXT } from './data-type-workspace.context-token.js'; -import type { UUIInputElement} from '@umbraco-cms/backoffice/external/uui'; +import type { UUIInputElement } from '@umbraco-cms/backoffice/external/uui'; import { UUIInputEvent } from '@umbraco-cms/backoffice/external/uui'; import { css, html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { ManifestWorkspace } from '@umbraco-cms/backoffice/extension-registry'; /** * @element umb-data-type-workspace-editor diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/workspace/data-type-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/data-type/workspace/data-type-workspace.element.ts index a5c77833e8..b675d2e39f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/workspace/data-type-workspace.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/data-type/workspace/data-type-workspace.element.ts @@ -3,7 +3,7 @@ import { UmbDataTypeWorkspaceContext } from './data-type-workspace.context.js'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { html, customElement } from '@umbraco-cms/backoffice/external/lit'; import type { UmbRoute } from '@umbraco-cms/backoffice/router'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { UmbWorkspaceIsNewRedirectController } from '@umbraco-cms/backoffice/workspace'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/workspace/views/details/data-type-details-workspace-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/data-type/workspace/views/details/data-type-details-workspace-view.element.ts index cd89698351..eb76e1a520 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/workspace/views/details/data-type-details-workspace-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/data-type/workspace/views/details/data-type-details-workspace-view.element.ts @@ -4,7 +4,7 @@ import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; import type { UmbModalManagerContext } from '@umbraco-cms/backoffice/modal'; import { UMB_MODAL_MANAGER_CONTEXT, UMB_PROPERTY_EDITOR_UI_PICKER_MODAL } from '@umbraco-cms/backoffice/modal'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbWorkspaceViewElement } from '@umbraco-cms/backoffice/extension-registry'; @customElement('umb-data-type-details-workspace-view') diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/workspace/views/info/workspace-view-data-type-info.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/data-type/workspace/views/info/workspace-view-data-type-info.element.ts index c89df9a893..104bd38daa 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/data-type/workspace/views/info/workspace-view-data-type-info.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/data-type/workspace/views/info/workspace-view-data-type-info.element.ts @@ -2,7 +2,7 @@ import { UMB_DATA_TYPE_WORKSPACE_CONTEXT } from '../../data-type-workspace.conte import type { UmbDataTypeDetailModel } from '../../../types.js'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbWorkspaceViewElement } from '@umbraco-cms/backoffice/extension-registry'; @customElement('umb-workspace-view-data-type-info') diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/debug/debug.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/debug/debug.element.ts index bfff10996f..d87d85f583 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/debug/debug.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/debug/debug.element.ts @@ -1,29 +1,12 @@ import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; -import type { - TemplateResult} from '@umbraco-cms/backoffice/external/lit'; -import { - css, - html, - nothing, - customElement, - property, - state, -} from '@umbraco-cms/backoffice/external/lit'; +import type { TemplateResult } from '@umbraco-cms/backoffice/external/lit'; +import { css, html, nothing, customElement, property, state } from '@umbraco-cms/backoffice/external/lit'; -import type { - DebugContextData, - DebugContextItemData} from '@umbraco-cms/backoffice/context-api'; -import { - contextData, - UmbContextDebugRequest, -} from '@umbraco-cms/backoffice/context-api'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; -import type { - UmbModalManagerContext} from '@umbraco-cms/backoffice/modal'; -import { - UMB_CONTEXT_DEBUGGER_MODAL, - UMB_MODAL_MANAGER_CONTEXT, -} from '@umbraco-cms/backoffice/modal'; +import type { DebugContextData, DebugContextItemData } from '@umbraco-cms/backoffice/context-api'; +import { contextData, UmbContextDebugRequest } from '@umbraco-cms/backoffice/context-api'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; +import type { UmbModalManagerContext } from '@umbraco-cms/backoffice/modal'; +import { UMB_CONTEXT_DEBUGGER_MODAL, UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal'; @customElement('umb-debug') export class UmbDebugElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/entity-action-list.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/entity-action-list.element.ts index 4cfd6e860f..c1c172dad6 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/entity-action-list.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/entity-action-list.element.ts @@ -1,6 +1,6 @@ import { html, customElement, property, state, css } from '@umbraco-cms/backoffice/external/lit'; import type { ManifestEntityAction } from '@umbraco-cms/backoffice/extension-registry'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-entity-action-list') export class UmbEntityActionListElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/entity-action.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/entity-action.element.ts index c5fd03d3e1..14cab2580b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/entity-action.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/entity-action.element.ts @@ -1,7 +1,7 @@ import { UmbActionExecutedEvent } from '@umbraco-cms/backoffice/event'; import { html, nothing, ifDefined, customElement, property, state } from '@umbraco-cms/backoffice/external/lit'; import type { UUIMenuItemEvent } from '@umbraco-cms/backoffice/external/uui'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { ManifestEntityAction } from '@umbraco-cms/backoffice/extension-registry'; import { createExtensionApi } from '@umbraco-cms/backoffice/extension-api'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/entity-bulk-action.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/entity-bulk-action.element.ts index 8fde10686b..e18e12219e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/entity-bulk-action.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/entity-bulk-action.element.ts @@ -2,7 +2,7 @@ import type { UmbEntityBulkActionBase } from './entity-bulk-action.js'; import { UmbActionExecutedEvent } from '@umbraco-cms/backoffice/event'; import { html, ifDefined, customElement, property } from '@umbraco-cms/backoffice/external/lit'; import type { ManifestEntityBulkAction } from '@umbraco-cms/backoffice/extension-registry'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { createExtensionApi } from '@umbraco-cms/backoffice/extension-api'; @customElement('umb-entity-bulk-action') diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/collection/views/extension-table-action-column-layout.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/collection/views/extension-table-action-column-layout.element.ts index dd3da19098..1d50bcaa65 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/collection/views/extension-table-action-column-layout.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/collection/views/extension-table-action-column-layout.element.ts @@ -1,7 +1,7 @@ import { umbExtensionsRegistry, type ManifestTypes } from '../../index.js'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { html, customElement, property } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbModalManagerContext } from '@umbraco-cms/backoffice/modal'; import { UMB_CONFIRM_MODAL, UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/collection/views/table/extension-table-collection-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/collection/views/table/extension-table-collection-view.element.ts index 3156c3c6ef..a6bca34155 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/collection/views/table/extension-table-collection-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/collection/views/table/extension-table-collection-view.element.ts @@ -3,7 +3,7 @@ import { UMB_DEFAULT_COLLECTION_CONTEXT } from '@umbraco-cms/backoffice/collecti import type { UmbTableColumn, UmbTableConfig, UmbTableItem } from '@umbraco-cms/backoffice/components'; import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { ManifestBase } from '@umbraco-cms/backoffice/extension-api'; import '../extension-table-action-column-layout.element.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/index.ts index e1ab5efa00..60327954b6 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/index.ts @@ -31,7 +31,6 @@ import type { ManifestWorkspace } from './workspace.model.js'; import type { ManifestWorkspaceAction } from './workspace-action.model.js'; import type { ManifestWorkspaceContext } from './workspace-context.model.js'; import type { ManifestWorkspaceView } from './workspace-view.model.js'; -import type { ManifestWorkspaceViewCollection } from './workspace-view-collection.model.js'; import type { ManifestUserPermission } from './user-permission.model.js'; import type { ManifestUserGranularPermission } from './user-granular-permission.model.js'; import type { ManifestCollectionAction } from './collection-action.model.js'; @@ -77,7 +76,6 @@ export type * from './user-profile-app.model.js'; export type * from './workspace-action.model.js'; export type * from './workspace-context.model.js'; export type * from './workspace-view.model.js'; -export type * from './workspace-view-collection.model.js'; export type * from './workspace.model.js'; export type ManifestTypes = @@ -125,7 +123,6 @@ export type ManifestTypes = | ManifestWorkspaceAction | ManifestWorkspaceContext | ManifestWorkspaceView - | ManifestWorkspaceViewCollection | ManifestUserPermission | ManifestUserGranularPermission | ManifestBase; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/workspace-view-collection.model.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/workspace-view-collection.model.ts deleted file mode 100644 index 08fbf0e596..0000000000 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/workspace-view-collection.model.ts +++ /dev/null @@ -1,32 +0,0 @@ -import type { ConditionTypes } from '../conditions/types.js'; -import type { - ManifestWithDynamicConditions, - ManifestWithView, - MetaManifestWithView, -} from '@umbraco-cms/backoffice/extension-api'; - -export interface ManifestWorkspaceViewCollection - extends ManifestWithView, - ManifestWithDynamicConditions { - type: 'workspaceViewCollection'; - meta: MetaEditorViewCollection; -} - -export interface MetaEditorViewCollection extends MetaManifestWithView { - /** - * The entity type that this view collection should be available in - * - * @examples [ - * "media" - * ] - */ - entityType: string; - - /** - * The repository alias that this view collection should be available in - * @examples [ - * "Umb.Repository.Media" - * ] - */ - repositoryAlias: string; -} diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/workspace/extension-root-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/workspace/extension-root-workspace.element.ts index 67321c8c21..5c0b6be00f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/workspace/extension-root-workspace.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/workspace/extension-root-workspace.element.ts @@ -1,7 +1,7 @@ import { UMB_EXTENSION_COLLECTION_ALIAS } from '../collection/manifests.js'; import { UMB_EXTENSION_ROOT_WORKSPACE_ALIAS } from './manifests.js'; import { html, customElement } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-extension-root-workspace') export class UmbExtensionRootWorkspaceElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/shared/lit-element/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/lit-element/index.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/shared/lit-element/index.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/lit-element/index.ts diff --git a/src/Umbraco.Web.UI.Client/src/shared/lit-element/lit-element.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/lit-element/lit-element.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/shared/lit-element/lit-element.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/lit-element/lit-element.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/localization/components/ui-culture-input/ui-culture-input.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/localization/components/ui-culture-input/ui-culture-input.element.ts index 5d49ac03fd..bbed3c9eac 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/localization/components/ui-culture-input/ui-culture-input.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/localization/components/ui-culture-input/ui-culture-input.element.ts @@ -2,7 +2,7 @@ import { UmbChangeEvent } from '@umbraco-cms/backoffice/event'; import { css, html, customElement, query, state, property } from '@umbraco-cms/backoffice/external/lit'; import type { UUIComboboxElement, UUIComboboxEvent } from '@umbraco-cms/backoffice/external/uui'; import { FormControlMixin } from '@umbraco-cms/backoffice/external/uui'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { ManifestLocalization } from '@umbraco-cms/backoffice/extension-registry'; import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/localization/localize-date.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/localization/localize-date.element.ts index ad2229e63e..fbddbaeccb 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/localization/localize-date.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/localization/localize-date.element.ts @@ -1,5 +1,5 @@ import { css, customElement, html, property, state, unsafeHTML } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; /** * This element allows you to localize a date diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/localization/localize-number.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/localization/localize-number.element.ts index 872ae674a3..2b56c5cde9 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/localization/localize-number.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/localization/localize-number.element.ts @@ -1,5 +1,5 @@ import { css, customElement, html, property, state, unsafeHTML } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; /** * This element allows you to localize a number diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/localization/localize-relative-time.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/localization/localize-relative-time.element.ts index 4b47c0b731..cea71c8a97 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/localization/localize-relative-time.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/localization/localize-relative-time.element.ts @@ -1,5 +1,5 @@ import { css, customElement, html, property, state, unsafeHTML } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; /** * This element allows you to localize a relative time diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/localization/localize.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/localization/localize.element.ts index 0c93994195..aabbcf22fc 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/localization/localize.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/localization/localize.element.ts @@ -1,5 +1,5 @@ import { css, customElement, html, property, state, unsafeHTML } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; /** * This element allows you to localize a string with optional interpolation values. diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/menu/menu-item-layout/menu-item-layout.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/menu/menu-item-layout/menu-item-layout.element.ts index d168325294..bb0e2a40f8 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/menu/menu-item-layout/menu-item-layout.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/menu/menu-item-layout/menu-item-layout.element.ts @@ -1,8 +1,8 @@ import { html, customElement, property, state, ifDefined } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; -import type { UmbSectionContext} from '@umbraco-cms/backoffice/section'; +import type { UmbSectionContext } from '@umbraco-cms/backoffice/section'; import { UMB_SECTION_CONTEXT } from '@umbraco-cms/backoffice/section'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-menu-item-layout') export class UmbMenuItemLayoutElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/menu/menu-item/menu-item-default.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/menu/menu-item/menu-item-default.element.ts index ebdffc27fa..7a9fcd1c74 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/menu/menu-item/menu-item-default.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/menu/menu-item/menu-item-default.element.ts @@ -1,6 +1,6 @@ import { html, ifDefined, customElement, property } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { ManifestMenuItem, UmbMenuItemElement } from '@umbraco-cms/backoffice/extension-registry'; @customElement('umb-menu-item-default') diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/menu/menu.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/menu/menu.element.ts index aa26bc19dc..5449caf2c5 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/menu/menu.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/menu/menu.element.ts @@ -1,7 +1,7 @@ import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { html, customElement, property } from '@umbraco-cms/backoffice/external/lit'; import type { ManifestMenu, ManifestMenuItem } from '@umbraco-cms/backoffice/extension-registry'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import './menu-item/menu-item-default.element.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modal/common/confirm/confirm-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/modal/common/confirm/confirm-modal.element.ts index 9a46e88f56..c26464fd11 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/modal/common/confirm/confirm-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/modal/common/confirm/confirm-modal.element.ts @@ -1,7 +1,7 @@ import { html, customElement, property } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import type { UmbConfirmModalData, UmbConfirmModalValue, UmbModalContext } from '@umbraco-cms/backoffice/modal'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-confirm-modal') export class UmbConfirmModalElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modal/modal-element.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/modal/modal-element.element.ts index 3a15a0649b..fede49f6a0 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/modal/modal-element.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/modal/modal-element.element.ts @@ -1,5 +1,5 @@ import { property } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbModalContext } from '@umbraco-cms/backoffice/modal'; import type { ManifestModal, UmbModalExtensionElement } from '@umbraco-cms/backoffice/extension-registry'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modal/modal-route-registration.controller.ts b/src/Umbraco.Web.UI.Client/src/packages/core/modal/modal-route-registration.controller.ts index 11751c8fc8..b148cae4c6 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/modal/modal-route-registration.controller.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/modal/modal-route-registration.controller.ts @@ -19,7 +19,7 @@ export class UmbModalRouteRegistrationController; export type UmbMediaTreePickerModalValue = UmbPickerModalValue; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/template-picker-modal.token.ts b/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/template-picker-modal.token.ts index b31056b56c..7e5273ffdf 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/template-picker-modal.token.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/template-picker-modal.token.ts @@ -13,7 +13,7 @@ export const UMB_TEMPLATE_PICKER_MODAL = new UmbModalToken { let element: UmbNotificationLayoutDefaultElement; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/notification/stories/story-notification-default-example.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/notification/stories/story-notification-default-example.element.ts index 4ae0df440d..c8b9f94dd0 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/notification/stories/story-notification-default-example.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/notification/stories/story-notification-default-example.element.ts @@ -2,11 +2,10 @@ import { html, customElement } from '@umbraco-cms/backoffice/external/lit'; import type { UmbNotificationColor, UmbNotificationOptions, - UmbNotificationContext} from '@umbraco-cms/backoffice/notification'; -import { - UMB_NOTIFICATION_CONTEXT, + UmbNotificationContext, } from '@umbraco-cms/backoffice/notification'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UMB_NOTIFICATION_CONTEXT } from '@umbraco-cms/backoffice/notification'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-story-notification-default-example') export class UmbStoryNotificationDefaultExampleElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/object-type/input-object-type.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/object-type/input-object-type.element.ts index 2d31c7230e..585089555c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/object-type/input-object-type.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/object-type/input-object-type.element.ts @@ -2,7 +2,7 @@ import { UmbObjectTypeRepository } from './object-type.repository.js'; import { html, customElement, property, query, state } from '@umbraco-cms/backoffice/external/lit'; import type { UUISelectElement } from '@umbraco-cms/backoffice/external/uui'; import { FormControlMixin } from '@umbraco-cms/backoffice/external/uui'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-input-object-type') export class UmbInputObjectTypeElement extends FormControlMixin(UmbLitElement) { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/object-type/object-type.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/core/object-type/object-type.repository.ts index 9957d47828..9e93f4e23a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/object-type/object-type.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/object-type/object-type.repository.ts @@ -1,4 +1,4 @@ -import { ObjectTypesResource } from '@umbraco-cms/backoffice/backend-api'; +import { ObjectTypesResource } from '@umbraco-cms/backoffice/external/backend-api'; import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import type { UmbApi } from '@umbraco-cms/backoffice/extension-api'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-action/common/clear/property-action-clear.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-action/common/clear/property-action-clear.element.ts index 686cc4a11c..443fdeab02 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-action/common/clear/property-action-clear.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-action/common/clear/property-action-clear.element.ts @@ -1,8 +1,8 @@ import type { UmbPropertyAction } from '../../shared/property-action/property-action.interface.js'; -import type { UmbPropertyContext} from '@umbraco-cms/backoffice/property'; +import type { UmbPropertyContext } from '@umbraco-cms/backoffice/property'; import { UMB_PROPERTY_CONTEXT } from '@umbraco-cms/backoffice/property'; import { html, customElement, property } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-property-action-clear') export class UmbPropertyActionClearElement extends UmbLitElement implements UmbPropertyAction { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-action/common/copy/property-action-copy.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-action/common/copy/property-action-copy.element.ts index f0d98bbc0f..a2d5dcc142 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-action/common/copy/property-action-copy.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-action/common/copy/property-action-copy.element.ts @@ -1,13 +1,9 @@ import type { UmbPropertyAction } from '../../shared/property-action/property-action.interface.js'; import { html, customElement, property } from '@umbraco-cms/backoffice/external/lit'; -import type { - UmbNotificationDefaultData, - UmbNotificationContext} from '@umbraco-cms/backoffice/notification'; -import { - UMB_NOTIFICATION_CONTEXT, -} from '@umbraco-cms/backoffice/notification'; +import type { UmbNotificationDefaultData, UmbNotificationContext } from '@umbraco-cms/backoffice/notification'; +import { UMB_NOTIFICATION_CONTEXT } from '@umbraco-cms/backoffice/notification'; //import { UMB_WORKSPACE_PROPERTY_CONTEXT } from '@umbraco-cms/backoffice/workspace'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-property-action-copy') export class UmbPropertyActionCopyElement extends UmbLitElement implements UmbPropertyAction { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-action/shared/property-action-menu/property-action-menu.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-action/shared/property-action-menu/property-action-menu.element.ts index 843db81fd7..00a6f58fb9 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-action/shared/property-action-menu/property-action-menu.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-action/shared/property-action-menu/property-action-menu.element.ts @@ -1,24 +1,11 @@ -import type { - CSSResultGroup} from '@umbraco-cms/backoffice/external/lit'; -import { - css, - html, - customElement, - property, - state, - repeat, - nothing, -} from '@umbraco-cms/backoffice/external/lit'; +import type { CSSResultGroup } from '@umbraco-cms/backoffice/external/lit'; +import { css, html, customElement, property, state, repeat, nothing } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; -import type { - ManifestPropertyAction, - ManifestTypes} from '@umbraco-cms/backoffice/extension-registry'; -import { - umbExtensionsRegistry, -} from '@umbraco-cms/backoffice/extension-registry'; -import type { UmbExtensionElementInitializer} from '@umbraco-cms/backoffice/extension-api'; +import type { ManifestPropertyAction, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; +import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; +import type { UmbExtensionElementInitializer } from '@umbraco-cms/backoffice/extension-api'; import { UmbExtensionsElementInitializer } from '@umbraco-cms/backoffice/extension-api'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-property-action-menu') export class UmbPropertyActionMenuElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/config/property-editor-config-collection.class.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/config/property-editor-config-collection.class.ts index 6cebb4beaa..60e151b62a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/config/property-editor-config-collection.class.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/config/property-editor-config-collection.class.ts @@ -1,5 +1,5 @@ import type { UmbPropertyEditorConfigProperty, UmbPropertyEditorConfig } from '../index.js'; -import type { DataTypePropertyPresentationModel } from '@umbraco-cms/backoffice/backend-api'; +import type { DataTypePropertyPresentationModel } from '@umbraco-cms/backoffice/external/backend-api'; /** * Extends Array to add utility functions for accessing data type properties diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/config/property-editor-config.type.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/config/property-editor-config.type.ts index 44eaf02a96..3e2e5686d4 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/config/property-editor-config.type.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/config/property-editor-config.type.ts @@ -1,4 +1,4 @@ -import type { DataTypePropertyPresentationModel } from '@umbraco-cms/backoffice/backend-api'; +import type { DataTypePropertyPresentationModel } from '@umbraco-cms/backoffice/external/backend-api'; export type UmbPropertyEditorConfigProperty = DataTypePropertyPresentationModel; export type UmbPropertyEditorConfig = UmbPropertyEditorConfigProperty[]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/checkbox-list/input-checkbox-list/input-checkbox-list.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/checkbox-list/input-checkbox-list/input-checkbox-list.element.ts index 4d3c7879df..90a4b31cdb 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/checkbox-list/input-checkbox-list/input-checkbox-list.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/checkbox-list/input-checkbox-list/input-checkbox-list.element.ts @@ -2,7 +2,7 @@ import { UmbChangeEvent } from '@umbraco-cms/backoffice/event'; import { css, html, nothing, repeat, customElement, property } from '@umbraco-cms/backoffice/external/lit'; import type { UUIBooleanInputEvent } from '@umbraco-cms/backoffice/external/uui'; import { FormControlMixin } from '@umbraco-cms/backoffice/external/uui'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-input-checkbox-list') export class UmbInputCheckboxListElement extends FormControlMixin(UmbLitElement) { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/checkbox-list/property-editor-ui-checkbox-list.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/checkbox-list/property-editor-ui-checkbox-list.element.ts index 8b88b7578c..809fbd3d72 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/checkbox-list/property-editor-ui-checkbox-list.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/checkbox-list/property-editor-ui-checkbox-list.element.ts @@ -3,7 +3,7 @@ import './input-checkbox-list/input-checkbox-list.element.js'; import { html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor'; /** diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/property-editor-ui-collection-view-bulk-action-permissions.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/property-editor-ui-collection-view-bulk-action-permissions.element.ts index d851b94530..b4cd82e274 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/property-editor-ui-collection-view-bulk-action-permissions.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/property-editor-ui-collection-view-bulk-action-permissions.element.ts @@ -1,13 +1,10 @@ import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry'; import { html, customElement, property, css } from '@umbraco-cms/backoffice/external/lit'; import type { UUIBooleanInputEvent } from '@umbraco-cms/backoffice/external/uui'; -import type { - UmbPropertyEditorConfigCollection} from '@umbraco-cms/backoffice/property-editor'; -import { - UmbPropertyValueChangeEvent, -} from '@umbraco-cms/backoffice/property-editor'; +import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor'; +import { UmbPropertyValueChangeEvent } from '@umbraco-cms/backoffice/property-editor'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; type BulkActionPermissionType = | 'allowBulkCopy' @@ -76,7 +73,7 @@ export class UmbPropertyEditorUICollectionViewBulkActionPermissionsElement render() { return html` this.#onChange(e, 'allowBulkPublish')} label="Allow bulk publish (content only)"> this.#onChange(e, 'allowBulkDelete')} - label="Allow bulk delete"> `; + label="Allow bulk delete">`; } static styles = [ diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/column-configuration/property-editor-ui-collection-view-column-configuration.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/column-configuration/property-editor-ui-collection-view-column-configuration.element.ts index b70ecbbe64..4625960edb 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/column-configuration/property-editor-ui-collection-view-column-configuration.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/column-configuration/property-editor-ui-collection-view-column-configuration.element.ts @@ -1,13 +1,10 @@ import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry'; import { html, customElement, property, repeat, css, query, state } from '@umbraco-cms/backoffice/external/lit'; import type { UUIInputEvent, UUISelectElement } from '@umbraco-cms/backoffice/external/uui'; -import type { - UmbPropertyEditorConfigCollection} from '@umbraco-cms/backoffice/property-editor'; -import { - UmbPropertyValueChangeEvent, -} from '@umbraco-cms/backoffice/property-editor'; +import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor'; +import { UmbPropertyValueChangeEvent } from '@umbraco-cms/backoffice/property-editor'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; interface ColumnConfig { alias: string; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/layout-configuration/property-editor-ui-collection-view-layout-configuration.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/layout-configuration/property-editor-ui-collection-view-layout-configuration.element.ts index a9ec636f80..ea49184b4a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/layout-configuration/property-editor-ui-collection-view-layout-configuration.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/layout-configuration/property-editor-ui-collection-view-layout-configuration.element.ts @@ -2,19 +2,12 @@ import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extensi import { html, customElement, property, repeat, css, ifDefined } from '@umbraco-cms/backoffice/external/lit'; import type { UUIBooleanInputEvent, UUIInputEvent } from '@umbraco-cms/backoffice/external/uui'; import { extractUmbColorVariable } from '@umbraco-cms/backoffice/resources'; -import type { - UmbModalManagerContext} from '@umbraco-cms/backoffice/modal'; -import { - UMB_ICON_PICKER_MODAL, - UMB_MODAL_MANAGER_CONTEXT -} from '@umbraco-cms/backoffice/modal'; -import type { - UmbPropertyEditorConfigCollection} from '@umbraco-cms/backoffice/property-editor'; -import { - UmbPropertyValueChangeEvent, -} from '@umbraco-cms/backoffice/property-editor'; +import type { UmbModalManagerContext } from '@umbraco-cms/backoffice/modal'; +import { UMB_ICON_PICKER_MODAL, UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal'; +import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor'; +import { UmbPropertyValueChangeEvent } from '@umbraco-cms/backoffice/property-editor'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; interface LayoutConfig { icon?: string; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/order-by/property-editor-ui-collection-view-order-by.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/order-by/property-editor-ui-collection-view-order-by.element.ts index 39d68e31e6..98b45396c6 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/order-by/property-editor-ui-collection-view-order-by.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/order-by/property-editor-ui-collection-view-order-by.element.ts @@ -1,13 +1,10 @@ import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry'; import { html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit'; import type { UUISelectEvent } from '@umbraco-cms/backoffice/external/uui'; -import type { - UmbPropertyEditorConfigCollection} from '@umbraco-cms/backoffice/property-editor'; -import { - UmbPropertyValueChangeEvent, -} from '@umbraco-cms/backoffice/property-editor'; +import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor'; +import { UmbPropertyValueChangeEvent } from '@umbraco-cms/backoffice/property-editor'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; /** * @element umb-property-editor-ui-collection-view-order-by diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/property-editor-ui-collection-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/property-editor-ui-collection-view.element.ts index 464e439d61..c46b9de01c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/property-editor-ui-collection-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/property-editor-ui-collection-view.element.ts @@ -2,7 +2,7 @@ import type { UmbPropertyEditorConfigCollection } from '../../config/index.js'; import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry'; import { html, customElement, property } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; /** * @element umb-property-editor-ui-collection-view diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/color-picker/property-editor-ui-color-picker.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/color-picker/property-editor-ui-color-picker.element.ts index 246ad602ca..d0d796877b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/color-picker/property-editor-ui-color-picker.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/color-picker/property-editor-ui-color-picker.element.ts @@ -1,7 +1,7 @@ import { html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit'; import type { UUIColorSwatchesEvent } from '@umbraco-cms/backoffice/external/uui'; import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbSwatchDetails } from '@umbraco-cms/backoffice/models'; import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/color-swatches-editor/property-editor-ui-color-swatches-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/color-swatches-editor/property-editor-ui-color-swatches-editor.element.ts index 569c55b022..03a10ddfcf 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/color-swatches-editor/property-editor-ui-color-swatches-editor.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/color-swatches-editor/property-editor-ui-color-swatches-editor.element.ts @@ -1,6 +1,6 @@ import { html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit'; import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbSwatchDetails } from '@umbraco-cms/backoffice/models'; import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor'; import type { UmbMultipleColorPickerInputElement } from '@umbraco-cms/backoffice/components'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/date-picker/property-editor-ui-date-picker.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/date-picker/property-editor-ui-date-picker.element.ts index a92d437567..35cb9962fa 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/date-picker/property-editor-ui-date-picker.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/date-picker/property-editor-ui-date-picker.element.ts @@ -1,9 +1,9 @@ -import type { UmbPropertyEditorConfigCollection} from '../../index.js'; +import type { UmbPropertyEditorConfigCollection } from '../../index.js'; import { UmbPropertyValueChangeEvent } from '../../index.js'; import { html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbInputDateElement } from '@umbraco-cms/backoffice/components'; /** diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/dropdown/property-editor-ui-dropdown.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/dropdown/property-editor-ui-dropdown.element.ts index 1443c5b309..d434ece0eb 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/dropdown/property-editor-ui-dropdown.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/dropdown/property-editor-ui-dropdown.element.ts @@ -3,7 +3,7 @@ import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry'; import type { UUISelectEvent } from '@umbraco-cms/backoffice/external/uui'; import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; /** * @element umb-property-editor-ui-dropdown diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/eye-dropper/property-editor-ui-eye-dropper.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/eye-dropper/property-editor-ui-eye-dropper.element.ts index 6ea7039a22..e3b4edd102 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/eye-dropper/property-editor-ui-eye-dropper.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/eye-dropper/property-editor-ui-eye-dropper.element.ts @@ -1,7 +1,7 @@ import { html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit'; import type { UUIColorPickerChangeEvent } from '@umbraco-cms/backoffice/external/uui'; import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor'; /** diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/icon-picker/property-editor-ui-icon-picker.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/icon-picker/property-editor-ui-icon-picker.element.ts index ee28700ca2..aab161a0b6 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/icon-picker/property-editor-ui-icon-picker.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/icon-picker/property-editor-ui-icon-picker.element.ts @@ -1,13 +1,9 @@ import { html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry'; -import type { - UmbModalManagerContext} from '@umbraco-cms/backoffice/modal'; -import { - UMB_MODAL_MANAGER_CONTEXT, - UMB_ICON_PICKER_MODAL, -} from '@umbraco-cms/backoffice/modal'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import type { UmbModalManagerContext } from '@umbraco-cms/backoffice/modal'; +import { UMB_MODAL_MANAGER_CONTEXT, UMB_ICON_PICKER_MODAL } from '@umbraco-cms/backoffice/modal'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor'; import { extractUmbColorVariable } from '@umbraco-cms/backoffice/resources'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/label/property-editor-ui-label.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/label/property-editor-ui-label.element.ts index e32a852a29..73216018a9 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/label/property-editor-ui-label.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/label/property-editor-ui-label.element.ts @@ -1,7 +1,7 @@ import { html, customElement, property } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor'; /** diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/markdown-editor/property-editor-ui-markdown-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/markdown-editor/property-editor-ui-markdown-editor.element.ts index eb1c2b39a3..16603a50b5 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/markdown-editor/property-editor-ui-markdown-editor.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/markdown-editor/property-editor-ui-markdown-editor.element.ts @@ -2,7 +2,7 @@ import type { UmbInputMarkdownElement } from '../../../components/input-markdown import '../../../components/input-markdown-editor/index.js'; import { html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit'; import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor'; import type { UUIModalSidebarSize } from '@umbraco-cms/backoffice/external/uui'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/member-group-picker/property-editor-ui-member-group-picker.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/member-group-picker/property-editor-ui-member-group-picker.element.ts index 0fd634ca8d..b9c2b8de3c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/member-group-picker/property-editor-ui-member-group-picker.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/member-group-picker/property-editor-ui-member-group-picker.element.ts @@ -1,7 +1,7 @@ import { html, customElement, property } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor'; /** diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/member-picker/property-editor-ui-member-picker.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/member-picker/property-editor-ui-member-picker.element.ts index 161f0c8385..087825bca2 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/member-picker/property-editor-ui-member-picker.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/member-picker/property-editor-ui-member-picker.element.ts @@ -1,7 +1,7 @@ import { html, customElement, property } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor'; /** diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/multi-url-picker/property-editor-ui-multi-url-picker.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/multi-url-picker/property-editor-ui-multi-url-picker.element.ts index ba2c1e161f..0df83516d5 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/multi-url-picker/property-editor-ui-multi-url-picker.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/multi-url-picker/property-editor-ui-multi-url-picker.element.ts @@ -5,7 +5,7 @@ import type { UUIModalSidebarSize } from '@umbraco-cms/backoffice/external/uui'; import type { UmbInputMultiUrlElement } from '@umbraco-cms/backoffice/components'; import type { UmbLinkPickerLink } from '@umbraco-cms/backoffice/modal'; import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor'; /** diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/multiple-text-string/property-editor-ui-multiple-text-string.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/multiple-text-string/property-editor-ui-multiple-text-string.element.ts index 251130a86b..6e9ff243ed 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/multiple-text-string/property-editor-ui-multiple-text-string.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/multiple-text-string/property-editor-ui-multiple-text-string.element.ts @@ -3,7 +3,7 @@ import type { UmbChangeEvent } from '@umbraco-cms/backoffice/event'; import { html, customElement, property, state, ifDefined } from '@umbraco-cms/backoffice/external/lit'; import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor'; import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { MultipleTextStringValue, UmbInputMultipleTextStringElement } from '@umbraco-cms/backoffice/components'; /** diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/number-range/property-editor-ui-number-range.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/number-range/property-editor-ui-number-range.element.ts index a242fc9829..8f02126d89 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/number-range/property-editor-ui-number-range.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/number-range/property-editor-ui-number-range.element.ts @@ -2,7 +2,7 @@ import type { UmbInputNumberRangeElement } from '../../../components/input-numbe import { html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor'; import type { NumberRangeValueType } from '@umbraco-cms/backoffice/models'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/number/property-editor-ui-number.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/number/property-editor-ui-number.element.ts index e397a9d3c6..6e455755c1 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/number/property-editor-ui-number.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/number/property-editor-ui-number.element.ts @@ -1,7 +1,7 @@ import { css, html, customElement, property, state, ifDefined } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor'; @customElement('umb-property-editor-ui-number') diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/order-direction/property-editor-ui-order-direction.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/order-direction/property-editor-ui-order-direction.element.ts index 893d7934af..ba1ff2b063 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/order-direction/property-editor-ui-order-direction.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/order-direction/property-editor-ui-order-direction.element.ts @@ -1,12 +1,9 @@ import { html, customElement, property, css } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; -import type { - UmbPropertyEditorConfigCollection} from '@umbraco-cms/backoffice/property-editor'; -import { - UmbPropertyValueChangeEvent, -} from '@umbraco-cms/backoffice/property-editor'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; +import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor'; +import { UmbPropertyValueChangeEvent } from '@umbraco-cms/backoffice/property-editor'; import type { UUIBooleanInputEvent } from '@umbraco-cms/backoffice/external/uui'; /** diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/overlay-size/property-editor-ui-overlay-size.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/overlay-size/property-editor-ui-overlay-size.element.ts index c486624d40..561be7bef0 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/overlay-size/property-editor-ui-overlay-size.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/overlay-size/property-editor-ui-overlay-size.element.ts @@ -1,7 +1,7 @@ import { html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor'; import type { UUIModalSidebarSize, UUISelectEvent } from '@umbraco-cms/backoffice/external/uui'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/radio-button-list/property-editor-ui-radio-button-list.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/radio-button-list/property-editor-ui-radio-button-list.element.ts index 122162f4ff..39e5065813 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/radio-button-list/property-editor-ui-radio-button-list.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/radio-button-list/property-editor-ui-radio-button-list.element.ts @@ -4,7 +4,7 @@ import { html, customElement, property, state } from '@umbraco-cms/backoffice/ex import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor'; import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; /** * @element umb-property-editor-ui-radio-button-list diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/slider/property-editor-ui-slider.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/slider/property-editor-ui-slider.element.ts index 9e9039f16b..75d6edbaf6 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/slider/property-editor-ui-slider.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/slider/property-editor-ui-slider.element.ts @@ -2,7 +2,7 @@ import type { UmbInputSliderElement } from '../../../components/input-slider/inp import { html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor'; /** diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/text-box/property-editor-ui-text-box.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/text-box/property-editor-ui-text-box.element.ts index de69b3e1b2..0e290a7555 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/text-box/property-editor-ui-text-box.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/text-box/property-editor-ui-text-box.element.ts @@ -1,7 +1,7 @@ import { css, html, customElement, property, state, ifDefined } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor'; import type { UUIInputElement } from '@umbraco-cms/backoffice/external/uui'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/textarea/property-editor-ui-textarea.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/textarea/property-editor-ui-textarea.element.ts index b1730b3e5f..f401ec20d6 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/textarea/property-editor-ui-textarea.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/textarea/property-editor-ui-textarea.element.ts @@ -1,7 +1,7 @@ import { css, html, customElement, property, state, ifDefined, styleMap } from '@umbraco-cms/backoffice/external/lit'; import type { UUITextareaElement } from '@umbraco-cms/backoffice/external/uui'; import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor'; @customElement('umb-property-editor-ui-textarea') diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tiny-mce/config/block-configuration/property-editor-ui-block-rte-type-configuration.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tiny-mce/config/block-configuration/property-editor-ui-block-rte-type-configuration.element.ts index db4281439e..b4a69e3303 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tiny-mce/config/block-configuration/property-editor-ui-block-rte-type-configuration.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tiny-mce/config/block-configuration/property-editor-ui-block-rte-type-configuration.element.ts @@ -1,10 +1,10 @@ -import type { UmbBlockTypeBaseModel} from '@umbraco-cms/backoffice/block'; +import type { UmbBlockTypeBaseModel } from '@umbraco-cms/backoffice/block'; import { UmbInputBlockTypeElement } from '@umbraco-cms/backoffice/block'; import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry'; import { html, customElement, property } from '@umbraco-cms/backoffice/external/lit'; import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; /** * @element umb-property-editor-ui-block-rte-type-configuration diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tiny-mce/config/dimensions/property-editor-ui-tiny-mce-dimensions-configuration.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tiny-mce/config/dimensions/property-editor-ui-tiny-mce-dimensions-configuration.element.ts index 0535060fc4..11a40ab8bb 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tiny-mce/config/dimensions/property-editor-ui-tiny-mce-dimensions-configuration.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tiny-mce/config/dimensions/property-editor-ui-tiny-mce-dimensions-configuration.element.ts @@ -1,6 +1,6 @@ import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { customElement, html, property } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; /** * @element umb-property-editor-ui-tiny-mce-dimensions-configuration diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tiny-mce/config/max-image-size/property-editor-ui-tiny-mce-maximagesize-configuration.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tiny-mce/config/max-image-size/property-editor-ui-tiny-mce-maximagesize-configuration.element.ts index 6f980fbf34..685646e255 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tiny-mce/config/max-image-size/property-editor-ui-tiny-mce-maximagesize-configuration.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tiny-mce/config/max-image-size/property-editor-ui-tiny-mce-maximagesize-configuration.element.ts @@ -1,6 +1,6 @@ import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { customElement, html, property } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry'; /** diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tiny-mce/config/stylesheets/property-editor-ui-tiny-mce-stylesheets-configuration.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tiny-mce/config/stylesheets/property-editor-ui-tiny-mce-stylesheets-configuration.element.ts index d747124164..8a27607ba5 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tiny-mce/config/stylesheets/property-editor-ui-tiny-mce-stylesheets-configuration.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tiny-mce/config/stylesheets/property-editor-ui-tiny-mce-stylesheets-configuration.element.ts @@ -1,12 +1,9 @@ import { UmbServerFilePathUniqueSerializer } from '@umbraco-cms/backoffice/server-file-system'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { css, customElement, html, property } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; -import type { - UmbPropertyEditorConfigCollection} from '@umbraco-cms/backoffice/property-editor'; -import { - UmbPropertyValueChangeEvent, -} from '@umbraco-cms/backoffice/property-editor'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; +import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor'; +import { UmbPropertyValueChangeEvent } from '@umbraco-cms/backoffice/property-editor'; import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry'; import type { UmbStylesheetInputElement } from '@umbraco-cms/backoffice/stylesheet'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tiny-mce/config/toolbar/property-editor-ui-tiny-mce-toolbar-configuration.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tiny-mce/config/toolbar/property-editor-ui-tiny-mce-toolbar-configuration.element.ts index 5c3f7306cd..155b58e253 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tiny-mce/config/toolbar/property-editor-ui-tiny-mce-toolbar-configuration.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tiny-mce/config/toolbar/property-editor-ui-tiny-mce-toolbar-configuration.element.ts @@ -1,7 +1,7 @@ import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import type { PropertyValueMap } from '@umbraco-cms/backoffice/external/lit'; import { customElement, css, html, property, map, state } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry'; import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; import { firstValueFrom } from '@umbraco-cms/backoffice/external/rxjs'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tiny-mce/property-editor-ui-tiny-mce.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tiny-mce/property-editor-ui-tiny-mce.element.ts index 354e594617..904f9bf974 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tiny-mce/property-editor-ui-tiny-mce.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tiny-mce/property-editor-ui-tiny-mce.element.ts @@ -1,7 +1,7 @@ import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { html, customElement, property } from '@umbraco-cms/backoffice/external/lit'; import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor'; type RichTextEditorValue = { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/toggle/property-editor-ui-toggle.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/toggle/property-editor-ui-toggle.element.ts index 91696bb174..fcb6e9802b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/toggle/property-editor-ui-toggle.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/toggle/property-editor-ui-toggle.element.ts @@ -3,7 +3,7 @@ import { html, customElement, property, state } from '@umbraco-cms/backoffice/ex import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor'; import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; /** * @element umb-property-editor-ui-toggle diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tree-picker/config/source-picker/property-editor-ui-tree-picker-source-picker.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tree-picker/config/source-picker/property-editor-ui-tree-picker-source-picker.element.ts index fb1bf20c07..97fffa0393 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tree-picker/config/source-picker/property-editor-ui-tree-picker-source-picker.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tree-picker/config/source-picker/property-editor-ui-tree-picker-source-picker.element.ts @@ -6,7 +6,7 @@ import { UmbPropertyValueChangeEvent, } from '@umbraco-cms/backoffice/property-editor'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; /** * @element umb-property-editor-ui-tree-picker-source-picker diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tree-picker/config/source-type-picker/property-editor-ui-tree-picker-source-type-picker.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tree-picker/config/source-type-picker/property-editor-ui-tree-picker-source-type-picker.element.ts index c11144dbd7..8750907c8e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tree-picker/config/source-type-picker/property-editor-ui-tree-picker-source-type-picker.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tree-picker/config/source-type-picker/property-editor-ui-tree-picker-source-type-picker.element.ts @@ -5,7 +5,7 @@ import type { UmbTreePickerSource } from '@umbraco-cms/backoffice/components'; import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry'; import { customElement, html, property, state } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { UMB_PROPERTY_DATASET_CONTEXT } from '@umbraco-cms/backoffice/property'; import { UmbPropertyValueChangeEvent } from '@umbraco-cms/backoffice/property-editor'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tree-picker/property-editor-ui-tree-picker.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tree-picker/property-editor-ui-tree-picker.element.ts index ebfe63e0c8..b60214047d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tree-picker/property-editor-ui-tree-picker.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tree-picker/property-editor-ui-tree-picker.element.ts @@ -1,5 +1,5 @@ import { html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { UmbPropertyValueChangeEvent } from '@umbraco-cms/backoffice/property-editor'; import { UmbDynamicRootRepository } from '@umbraco-cms/backoffice/dynamic-root'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/upload-field/property-editor-ui-upload-field.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/upload-field/property-editor-ui-upload-field.element.ts index e5bc320be4..be190090ea 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/upload-field/property-editor-ui-upload-field.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/upload-field/property-editor-ui-upload-field.element.ts @@ -2,7 +2,7 @@ import type { UmbInputUploadFieldElement } from '../../../components/input-uploa import { html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor'; /** diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/user-picker/property-editor-ui-user-picker.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/user-picker/property-editor-ui-user-picker.element.ts index 229d8c5b30..00f213ad42 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/user-picker/property-editor-ui-user-picker.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/user-picker/property-editor-ui-user-picker.element.ts @@ -1,7 +1,7 @@ import { html, customElement, property } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor'; /** diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/value-type/property-editor-ui-value-type.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/value-type/property-editor-ui-value-type.element.ts index 8f93353ee6..07cbb2288c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/value-type/property-editor-ui-value-type.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/value-type/property-editor-ui-value-type.element.ts @@ -2,7 +2,7 @@ import { html, customElement, property, state, query } from '@umbraco-cms/backof import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import type { UUISelectElement, UUISelectEvent } from '@umbraco-cms/backoffice/external/uui'; import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor'; /** diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property/property-dataset/property-dataset.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property/property-dataset/property-dataset.element.ts index b501549a4c..4f0d2a1396 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property/property-dataset/property-dataset.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property/property-dataset/property-dataset.element.ts @@ -1,6 +1,6 @@ import type { UmbPropertyValueData } from '../types/property-value-data.type.js'; import { UmbPropertyDatasetBaseContext } from './property-dataset-base-context.js'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { customElement, html, property } from '@umbraco-cms/backoffice/external/lit'; import { UmbChangeEvent } from '@umbraco-cms/backoffice/event'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property/property/property.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property/property/property.element.ts index 3ce0607da6..6566007310 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property/property/property.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property/property/property.element.ts @@ -5,7 +5,7 @@ import { createExtensionElement } from '@umbraco-cms/backoffice/extension-api'; import type { ManifestPropertyEditorUi } from '@umbraco-cms/backoffice/extension-registry'; import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; import type { UmbObserverController } from '@umbraco-cms/backoffice/observable-api'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbPropertyEditorConfigCollection, UmbPropertyEditorConfig, diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/data-source-response.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/data-source-response.interface.ts index ebe3cce84a..ac0d1d2879 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/data-source-response.interface.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/data-source-response.interface.ts @@ -1,4 +1,4 @@ -import type { ApiError, CancelError } from '@umbraco-cms/backoffice/backend-api'; +import type { ApiError, CancelError } from '@umbraco-cms/backoffice/external/backend-api'; export interface DataSourceResponse extends UmbDataSourceErrorResponse { data?: T; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/repository/item/item-repository.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/repository/item/item-repository.interface.ts index c343ea8cdb..0585c9cf4f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/repository/item/item-repository.interface.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/repository/item/item-repository.interface.ts @@ -1,5 +1,5 @@ import type { Observable } from '@umbraco-cms/backoffice/external/rxjs'; -import type { ProblemDetails } from '@umbraco-cms/backoffice/backend-api'; +import type { ProblemDetails } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbApi } from '@umbraco-cms/backoffice/extension-api'; export interface UmbItemRepository extends UmbApi { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/section/section-default.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/section/section-default.element.ts index b492d60634..859f69b3b7 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/section/section-default.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/section/section-default.element.ts @@ -6,13 +6,12 @@ import type { ManifestSection, ManifestSectionSidebarApp, ManifestSectionSidebarAppMenuKind, - UmbSectionElement} from '@umbraco-cms/backoffice/extension-registry'; -import { - umbExtensionsRegistry, + UmbSectionElement, } from '@umbraco-cms/backoffice/extension-registry'; +import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; import type { UmbRoute } from '@umbraco-cms/backoffice/router'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; -import type { UmbExtensionElementInitializer} from '@umbraco-cms/backoffice/extension-api'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; +import type { UmbExtensionElementInitializer } from '@umbraco-cms/backoffice/extension-api'; import { UmbExtensionsElementInitializer } from '@umbraco-cms/backoffice/extension-api'; /** diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/section/section-main-views/section-main-views.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/section/section-main-views/section-main-views.element.ts index c0442a7569..7b405fb9b1 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/section/section-main-views/section-main-views.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/section/section-main-views/section-main-views.element.ts @@ -5,12 +5,11 @@ import type { ManifestDashboard, ManifestSectionView, UmbDashboardElement, - UmbSectionViewElement} from '@umbraco-cms/backoffice/extension-registry'; -import { - umbExtensionsRegistry, + UmbSectionViewElement, } from '@umbraco-cms/backoffice/extension-registry'; +import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; import { UmbExtensionsManifestInitializer, createExtensionElement } from '@umbraco-cms/backoffice/extension-api'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { pathFolderName } from '@umbraco-cms/backoffice/utils'; // TODO: this might need a new name, since it's both views and dashboards diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/section/section-sidebar-context-menu/section-sidebar-context-menu.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/section/section-sidebar-context-menu/section-sidebar-context-menu.element.ts index d8b1738b73..3d50533599 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/section/section-sidebar-context-menu/section-sidebar-context-menu.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/section/section-sidebar-context-menu/section-sidebar-context-menu.element.ts @@ -1,8 +1,8 @@ -import type { UmbSectionSidebarContext} from '../section-sidebar/index.js'; +import type { UmbSectionSidebarContext } from '../section-sidebar/index.js'; import { UMB_SECTION_SIDEBAR_CONTEXT } from '../section-sidebar/index.js'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { css, html, nothing, customElement, state } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-section-sidebar-context-menu') export class UmbSectionSidebarContextMenuElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/section/section-sidebar-menu/section-sidebar-menu.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/section/section-sidebar-menu/section-sidebar-menu.element.ts index 0fadbecc0d..b69b8316f4 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/section/section-sidebar-menu/section-sidebar-menu.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/section/section-sidebar-menu/section-sidebar-menu.element.ts @@ -4,11 +4,10 @@ import type { ManifestMenu, ManifestSectionSidebarAppBaseMenu, ManifestSectionSidebarAppMenuKind, - UmbBackofficeManifestKind} from '@umbraco-cms/backoffice/extension-registry'; -import { - umbExtensionsRegistry, + UmbBackofficeManifestKind, } from '@umbraco-cms/backoffice/extension-registry'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; // TODO: Move to separate file: const manifest: UmbBackofficeManifestKind = { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/section/section-sidebar/section-sidebar.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/section/section-sidebar/section-sidebar.element.ts index 28fa72bb14..7db7ba90d7 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/section/section-sidebar/section-sidebar.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/section/section-sidebar/section-sidebar.element.ts @@ -1,7 +1,7 @@ import { UmbSectionSidebarContext, UMB_SECTION_SIDEBAR_CONTEXT } from './section-sidebar.context.js'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { css, html, customElement } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-section-sidebar') export class UmbSectionSidebarElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/settings/welcome-dashboard/settings-welcome-dashboard.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/settings/welcome-dashboard/settings-welcome-dashboard.element.ts index 2346fec171..b08ede7807 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/settings/welcome-dashboard/settings-welcome-dashboard.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/settings/welcome-dashboard/settings-welcome-dashboard.element.ts @@ -1,6 +1,6 @@ import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { css, html, customElement } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-settings-welcome-dashboard') export class UmbSettingsWelcomeDashboardElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/sorter/sorter.controller.test.ts b/src/Umbraco.Web.UI.Client/src/packages/core/sorter/sorter.controller.test.ts deleted file mode 100644 index b4c75cbfbb..0000000000 --- a/src/Umbraco.Web.UI.Client/src/packages/core/sorter/sorter.controller.test.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { fixture, html } from '@open-wc/testing'; - -describe('UmbContextConsumer', () => { - let hostElement: any; - - beforeEach(async () => { - hostElement = await fixture(html` `); - }); - - // TODO: Testing ideas: - // - Test that the model is updated correctly? - // - Test that the DOM is updated correctly? - // - Use the controller to sort the DOM and test that the model is updated correctly... -}); diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/store/entity-item.store.ts b/src/Umbraco.Web.UI.Client/src/packages/core/store/entity-item.store.ts deleted file mode 100644 index 1077e40f75..0000000000 --- a/src/Umbraco.Web.UI.Client/src/packages/core/store/entity-item.store.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { UmbStoreBase } from './store-base.js'; -import type { ItemResponseModelBaseModel } from '@umbraco-cms/backoffice/backend-api'; -import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; -import { UmbArrayState } from '@umbraco-cms/backoffice/observable-api'; - -/** - * @export - * @class UmbDataTypeItemStore - * @extends {UmbStoreBase} - * @description - Data Store for Data Type items - */ - -export class UmbEntityItemStore extends UmbStoreBase { - /** - * Creates an instance of UmbEntityItemStore. - * @param {UmbControllerHost} host - * @memberof UmbDataTypeItemStore - */ - constructor(host: UmbControllerHost, storeAlias: string) { - super(host, storeAlias, new UmbArrayState([], (x) => x.id)); - } - - items(ids: Array) { - return this._data.asObservablePart((items) => items.filter((item) => ids.includes(item.id))); - } -} diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/store/file-system-item.store.ts b/src/Umbraco.Web.UI.Client/src/packages/core/store/file-system-item.store.ts deleted file mode 100644 index ae2876901c..0000000000 --- a/src/Umbraco.Web.UI.Client/src/packages/core/store/file-system-item.store.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { UmbStoreBase } from './store-base.js'; -import { UmbArrayState } from '@umbraco-cms/backoffice/observable-api'; -import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; - -/** - * @export - * @class UmbFileSystemItemStore - * @extends {UmbStoreBase} - * @description - Data Store for File system items - */ - -export class UmbFileSystemItemStore extends UmbStoreBase { - constructor(host: UmbControllerHost, storeAlias: string) { - super(host, storeAlias, new UmbArrayState([], (x) => x.path)); - } - - /** - * Return an observable to observe file system items - * @param {Array} paths - * @return {*} - * @memberof UmbFileSystemItemStore - */ - items(paths: Array) { - return this._data.asObservablePart((items) => items.filter((item) => paths.includes(item.path ?? ''))); - } -} diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/store/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/store/index.ts index 9b03c755d5..325d58118d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/store/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/store/index.ts @@ -1,8 +1,6 @@ export * from './store-base.js'; export * from './store.interface.js'; export * from './store.js'; -export * from './entity-item.store.js'; -export * from './file-system-item.store.js'; export { UmbDetailStoreBase } from './detail-store-base.js'; export type { UmbDetailStore } from './detail-store.interface.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/store/store.ts b/src/Umbraco.Web.UI.Client/src/packages/core/store/store.ts index 03e73c7cc7..70dc02a749 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/store/store.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/store/store.ts @@ -35,8 +35,3 @@ export interface UmbEntityDetailStore extends UmbDataStore { */ save(data: T[]): Promise; } - -export interface UmbContentStore extends UmbEntityDetailStore { - // TODO: make something that is specific for UmbContentStore, or then we should get rid of it. But for now i kept it as we might want this for rollback or other things specific to Content types. - save(data: T[]): Promise; -} diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/temporary-file/components/temporary-file-badge.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/temporary-file/components/temporary-file-badge.element.ts index a507830b8a..84029b80b1 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/temporary-file/components/temporary-file-badge.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/temporary-file/components/temporary-file-badge.element.ts @@ -1,5 +1,5 @@ import { css, customElement, html, property } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { clamp } from '@umbraco-cms/backoffice/external/uui'; @customElement('umb-temporary-file-badge') diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/temporary-file/temporary-file.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/core/temporary-file/temporary-file.server.data-source.ts index 4d6675d369..97d9091c8e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/temporary-file/temporary-file.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/temporary-file/temporary-file.server.data-source.ts @@ -1,4 +1,4 @@ -import { TemporaryFileResource } from '@umbraco-cms/backoffice/backend-api'; +import { TemporaryFileResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/components/input-tree/input-tree.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/components/input-tree/input-tree.element.ts index 2e2f50ed32..d7f600c99f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/components/input-tree/input-tree.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/components/input-tree/input-tree.element.ts @@ -1,6 +1,6 @@ import { css, html, customElement, property } from '@umbraco-cms/backoffice/external/lit'; import { FormControlMixin } from '@umbraco-cms/backoffice/external/uui'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbInputDocumentElement } from '@umbraco-cms/backoffice/document'; import type { UmbInputMediaElement } from '@umbraco-cms/backoffice/media'; import type { UmbInputMemberElement } from '@umbraco-cms/backoffice/member'; @@ -74,8 +74,8 @@ export class UmbInputTreeElement extends FormControlMixin(UmbLitElement) { this.value = (event.target as UmbInputMediaElement).selectedIds.join(','); break; case 'member': - this.value = (event.target as UmbInputMemberElement).selectedIds.join(','); - break; + this.value = (event.target as UmbInputMemberElement).selectedIds.join(','); + break; default: break; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/data-source/tree-data-source.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/data-source/tree-data-source.interface.ts index e9a11b277b..b7faf17f03 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/data-source/tree-data-source.interface.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/data-source/tree-data-source.interface.ts @@ -2,11 +2,35 @@ import type { UmbTreeItemModelBase } from '../types.js'; import type { UmbPagedModel, DataSourceResponse } from '@umbraco-cms/backoffice/repository'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; +/** + * Interface for a tree data source constructor. + * @export + * @interface UmbTreeDataSourceConstructor + * @template TreeItemType + */ export interface UmbTreeDataSourceConstructor { new (host: UmbControllerHost): UmbTreeDataSource; } +/** + * Interface for a tree data source. + * @export + * @interface UmbTreeDataSource + * @template TreeItemType + */ export interface UmbTreeDataSource { + /** + * Gets the root items of the tree. + * @return {*} {Promise>>} + * @memberof UmbTreeDataSource + */ getRootItems(): Promise>>; + + /** + * Gets the children of the given parent item. + * @param {(string | null)} parentUnique + * @return {*} {Promise>} + * @memberof UmbTreeDataSource + */ getChildrenOf(parentUnique: string | null): Promise>>; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/data-source/tree-server-data-source-base.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/data-source/tree-server-data-source-base.ts index 7ec894515a..22bea85ee8 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/data-source/tree-server-data-source-base.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/data-source/tree-server-data-source-base.ts @@ -2,7 +2,7 @@ import type { UmbTreeItemModelBase } from '../types.js'; import type { UmbTreeDataSource } from './tree-data-source.interface.js'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; -import type { TreeItemPresentationModel } from '@umbraco-cms/backoffice/backend-api'; +import type { TreeItemPresentationModel } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbPagedModel } from '@umbraco-cms/backoffice/repository'; export interface UmbTreeServerDataSourceBaseArgs< diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-tree-item/entity-tree-item.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-tree-item/entity-tree-item.element.ts index d451b50b64..18725e6559 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-tree-item/entity-tree-item.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-tree-item/entity-tree-item.element.ts @@ -2,13 +2,9 @@ import type { UmbEntityTreeItemModel } from '../types.js'; import { UmbEntityTreeItemContext } from './entity-tree-item.context.js'; import { css, html, nothing, customElement, property } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; -import type { - UmbBackofficeManifestKind, - UmbTreeItemElement} from '@umbraco-cms/backoffice/extension-registry'; -import { - umbExtensionsRegistry, -} from '@umbraco-cms/backoffice/extension-registry'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; +import type { UmbBackofficeManifestKind, UmbTreeItemElement } from '@umbraco-cms/backoffice/extension-registry'; +import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; // TODO: Move to separate file: const manifest: UmbBackofficeManifestKind = { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/file-system-tree-item/file-system-tree-item.context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/file-system-tree-item/file-system-tree-item.context.ts deleted file mode 100644 index de3b87644a..0000000000 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/file-system-tree-item/file-system-tree-item.context.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { UmbTreeItemContextBase } from '../tree-item-base/tree-item-base.context.js'; -import type { UmbFileSystemTreeItemModel } from '../types.js'; -import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api'; -/** - * Tree item context for file system tree items. Uses the path as the unique identifier. - * - * @export - * @class UmbFileSystemTreeItemContext - * @extends {UmbTreeItemContextBase} - */ -export class UmbFileSystemTreeItemContext extends UmbTreeItemContextBase { - constructor(host: UmbControllerHostElement) { - super(host, (x: UmbFileSystemTreeItemModel) => x.path); - } - - constructPath(pathname: string, entityType: string, path: string) { - return `section/${pathname}/workspace/${entityType}/edit/${encodeURIComponent(path).replace('.', '-')}`; - } -} diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/file-system-tree-item/file-system-tree-item.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/file-system-tree-item/file-system-tree-item.element.ts deleted file mode 100644 index f70512d83b..0000000000 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/file-system-tree-item/file-system-tree-item.element.ts +++ /dev/null @@ -1,59 +0,0 @@ -import type { UmbFileSystemTreeItemModel } from '../types.js'; -import { UmbFileSystemTreeItemContext } from './file-system-tree-item.context.js'; -import { css, html, nothing, customElement, property } from '@umbraco-cms/backoffice/external/lit'; -import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; -import type { - UmbBackofficeManifestKind, - UmbTreeItemElement} from '@umbraco-cms/backoffice/extension-registry'; -import { - umbExtensionsRegistry, -} from '@umbraco-cms/backoffice/extension-registry'; - -// TODO: Move to separate file: -const manifest: UmbBackofficeManifestKind = { - type: 'kind', - alias: 'Umb.Kind.FileSystemTreeItem', - matchKind: 'fileSystem', - matchType: 'treeItem', - manifest: { - type: 'treeItem', - elementName: 'umb-file-system-tree-item', - }, -}; -umbExtensionsRegistry.register(manifest); -/** - * Tree item element for file system tree items. Uses the path as the unique identifier. - * - * @export - * @class UmbFileSystemTreeItemElement - * @extends {UmbLitElement} - * @implements {UmbTreeItemExtensionElement} - */ -@customElement('umb-file-system-tree-item') -export class UmbFileSystemTreeItemElement extends UmbLitElement implements UmbTreeItemElement { - private _item?: UmbFileSystemTreeItemModel; - @property({ type: Object, attribute: false }) - public get item() { - return this._item; - } - public set item(value: UmbFileSystemTreeItemModel | undefined) { - this._item = value; - this.#context.setTreeItem(value); - } - - #context = new UmbFileSystemTreeItemContext(this); - - render() { - if (!this.item) return nothing; - return html``; - } - - static styles = [UmbTextStyles, css``]; -} - -declare global { - interface HTMLElementTagNameMap { - 'umb-file-system-tree-item': UmbFileSystemTreeItemElement; - } -} diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/file-system-tree-item/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/file-system-tree-item/index.ts deleted file mode 100644 index 49d2a2038d..0000000000 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/file-system-tree-item/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from './file-system-tree-item.context.js'; -export * from './file-system-tree-item.element.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/file-system-tree.store.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/file-system-tree.store.ts deleted file mode 100644 index ae678e9464..0000000000 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/file-system-tree.store.ts +++ /dev/null @@ -1,55 +0,0 @@ -import type { UmbTreeStore } from './tree-store.interface.js'; -import type { UmbFileSystemTreeItemModel } from './types.js'; -import { UmbStoreBase } from '@umbraco-cms/backoffice/store'; -import { UmbArrayState } from '@umbraco-cms/backoffice/observable-api'; -import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api'; - -/** - * @export - * @class UmbFileSystemTreeStore - * @extends {UmbStoreBase} - * @description - File System Tree Store - */ -export class UmbFileSystemTreeStore - extends UmbStoreBase - implements UmbTreeStore -{ - constructor(host: UmbControllerHostElement, storeAlias: string) { - super(host, storeAlias, new UmbArrayState([], (x) => x.path)); - } - - /** - * An observable to observe the root items - * @memberof UmbFileSystemTreeStore - */ - rootItems = this._data.asObservablePart((items) => items.filter((item) => item.path?.includes('/') === false)); - - /** - * Returns an observable to observe the children of a given parent - * @param {(string | null)} parentPath - * @return {*} - * @memberof UmbFileSystemTreeStore - */ - childrenOf(parentPath: string | null) { - if (parentPath === null) { - return this.rootItems; - } - - return this._data.asObservablePart((items) => - items.filter((item) => { - const pathCut = item.path?.substring(0, item.path?.lastIndexOf('/')); - return parentPath === pathCut; - }), - ); - } - - /** - * Returns an observable to observe the items with the given ids - * @param {Array} paths - * @return {*} - * @memberof UmbFileSystemTreeStore - */ - items(paths: Array) { - return this._data.asObservablePart((items) => items.filter((item) => paths.includes(item.path ?? ''))); - } -} diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/index.ts index c502da8f77..13405078bf 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/index.ts @@ -1,6 +1,5 @@ export * from './components/index.js'; export * from './entity-tree-item/index.js'; -export * from './file-system-tree-item/index.js'; export * from './tree-item-default/index.js'; export * from './tree-item-base/index.js'; export * from './tree-menu-item-default/index.js'; @@ -10,7 +9,6 @@ export * from './types.js'; export * from './tree-repository.interface.js'; export * from './tree-store.interface.js'; export * from './entity-tree-store.js'; -export * from './file-system-tree.store.js'; // Unique export * from './unique-tree-store.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item-base/tree-item-base.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item-base/tree-item-base.element.ts index ffa69d14b6..40093427d5 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item-base/tree-item-base.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item-base/tree-item-base.element.ts @@ -3,7 +3,7 @@ import type { UmbTreeItemModelBase } from '../types.js'; import { UMB_TREE_ITEM_CONTEXT } from './tree-item-base.context.js'; import { css, html, nothing, customElement, state, ifDefined, repeat } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-tree-item-base') export class UmbTreeItemBaseElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item-default/tree-item.context.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item-default/tree-item.context.interface.ts index 7f58939bea..a75249bf0a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item-default/tree-item.context.interface.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item-default/tree-item.context.interface.ts @@ -1,6 +1,6 @@ import type { UmbTreeItemModelBase } from '../types.js'; import type { Observable } from '@umbraco-cms/backoffice/external/rxjs'; -import type { ProblemDetails } from '@umbraco-cms/backoffice/backend-api'; +import type { ProblemDetails } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbPagedModel } from '@umbraco-cms/backoffice/repository'; export interface UmbTreeItemContext { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item-default/tree-item.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item-default/tree-item.element.ts index 4b27470ae5..9ae2c30f17 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item-default/tree-item.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item-default/tree-item.element.ts @@ -2,7 +2,7 @@ import type { UmbTreeItemModelBase } from '../types.js'; import { css, html, nothing, customElement, property } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import type { ManifestTreeItem } from '@umbraco-cms/backoffice/extension-registry'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-tree-item-default') export class UmbTreeItemDefaultElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-menu-item-default/tree-menu-item-default.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-menu-item-default/tree-menu-item-default.element.ts index f06de51854..8478ba005d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-menu-item-default/tree-menu-item-default.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-menu-item-default/tree-menu-item-default.element.ts @@ -1,5 +1,5 @@ import { html, nothing, customElement, property } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { ManifestMenuItemTreeKind, UmbBackofficeManifestKind, diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-repository-base.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-repository-base.ts index 534cff3d55..bb494fc46d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-repository-base.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-repository-base.ts @@ -2,8 +2,6 @@ import type { UmbTreeStore } from './tree-store.interface.js'; import type { UmbEntityTreeItemModel, UmbEntityTreeRootModel, - UmbFileSystemTreeItemModel, - UmbFileSystemTreeRootModel, UmbUniqueTreeItemModel, UmbUniqueTreeRootModel, } from './types.js'; @@ -14,10 +12,21 @@ import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import type { UmbApi } from '@umbraco-cms/backoffice/extension-api'; import type { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; +/** + * Base class for a tree repository. + * @export + * @abstract + * @class UmbTreeRepositoryBase + * @extends {UmbRepositoryBase} + * @implements {UmbTreeRepository} + * @implements {UmbApi} + * @template TreeItemType + * @template TreeRootType + */ export abstract class UmbTreeRepositoryBase< - // TODO: remove UmbEntityTreeItemModel and UmbFileSystemTreeItemModel when we have unique in place - TreeItemType extends UmbUniqueTreeItemModel | UmbEntityTreeItemModel | UmbFileSystemTreeItemModel, - TreeRootType extends UmbUniqueTreeRootModel | UmbEntityTreeRootModel | UmbFileSystemTreeRootModel, + // TODO: remove UmbEntityTreeItemModel when we have unique in place + TreeItemType extends UmbUniqueTreeItemModel | UmbEntityTreeItemModel, + TreeRootType extends UmbUniqueTreeRootModel | UmbEntityTreeRootModel, > extends UmbRepositoryBase implements UmbTreeRepository, UmbApi @@ -26,13 +35,20 @@ export abstract class UmbTreeRepositoryBase< protected _treeStore?: UmbTreeStore; #treeSource: UmbTreeDataSource; + /** + * Creates an instance of UmbTreeRepositoryBase. + * @param {UmbControllerHost} host + * @param {UmbTreeDataSourceConstructor} treeSourceConstructor + * @param {(string | UmbContextToken)} treeStoreContextAlias + * @memberof UmbTreeRepositoryBase + */ constructor( host: UmbControllerHost, - treeSource: UmbTreeDataSourceConstructor, + treeSourceConstructor: UmbTreeDataSourceConstructor, treeStoreContextAlias: string | UmbContextToken, ) { super(host); - this.#treeSource = new treeSource(this); + this.#treeSource = new treeSourceConstructor(this); this._init = this.consumeContext(treeStoreContextAlias, (instance) => { this._treeStore = instance; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-repository.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-repository.interface.ts index 3eca4d2847..153a65f287 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-repository.interface.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-repository.interface.ts @@ -1,46 +1,61 @@ import type { UmbTreeItemModelBase } from './types.js'; import type { UmbPagedModel } from '@umbraco-cms/backoffice/repository'; import type { Observable } from '@umbraco-cms/backoffice/external/rxjs'; -import type { ProblemDetails } from '@umbraco-cms/backoffice/backend-api'; +import type { ProblemDetails } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbApi } from '@umbraco-cms/backoffice/extension-api'; +/** + * Interface for a tree repository. + * @export + * @interface UmbTreeRepository + * @extends {UmbApi} + * @template TreeItemType + * @template TreeRootType + */ export interface UmbTreeRepository< TreeItemType extends UmbTreeItemModelBase = UmbTreeItemModelBase, TreeRootType extends UmbTreeItemModelBase = UmbTreeItemModelBase, > extends UmbApi { + /** + * Requests the root of the tree. + * @memberof UmbTreeRepository + */ requestTreeRoot: () => Promise<{ data?: TreeRootType; error?: ProblemDetails; }>; - requestTreeItemsOf: (parentUnique: string | null) => Promise<{ - data?: UmbPagedModel; - error?: ProblemDetails; - asObservable?: () => Observable; - }>; - - treeItemsOf: (parentUnique: string | null) => Promise>; - - /* TODO: remove this. It is not used client side. - Logic to call the root endpoint should be in the data source - because it is a server decision to split them - */ + /** + * Requests the root items of the tree. + * @memberof UmbTreeRepository + */ requestRootTreeItems: () => Promise<{ data?: UmbPagedModel; error?: ProblemDetails; asObservable?: () => Observable; }>; - // TODO: remove - rootTreeItems: () => Promise>; - - // TODO: remove this when all repositories are migrated to the new interface items interface - requestItemsLegacy?: (uniques: string[]) => Promise<{ - data?: Array; + /** + * Requests the items of a item in the tree. + * @param {(string | null)} parentUnique + * @memberof UmbTreeRepository + */ + requestTreeItemsOf: (parentUnique: string | null) => Promise<{ + data?: UmbPagedModel; error?: ProblemDetails; - asObservable?: () => Observable; + asObservable?: () => Observable; }>; - // TODO: remove this when all repositories are migrated to the new items interface - itemsLegacy?: (uniques: string[]) => Promise>; + /** + * Returns an observable of the root items of the tree. + * @memberof UmbTreeRepository + */ + rootTreeItems: () => Promise>; + + /** + * Returns an observable of the children of the given parent item. + * @param {(string | null)} parentUnique + * @memberof UmbTreeRepository + */ + treeItemsOf: (parentUnique: string | null) => Promise>; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-store.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-store.interface.ts index e52551355c..dbeefe8ed6 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-store.interface.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-store.interface.ts @@ -3,9 +3,26 @@ import type { UmbStore } from '@umbraco-cms/backoffice/store'; import type { Observable } from '@umbraco-cms/backoffice/external/rxjs'; import type { UmbApi } from '@umbraco-cms/backoffice/extension-api'; +/** + * Interface for a tree store. + * @export + * @interface UmbTreeStore + * @extends {UmbStore} + * @extends {UmbApi} + * @template TreeItemType + */ export interface UmbTreeStore extends UmbStore, UmbApi { + /** + * Returns an observable of the root items of the tree. + * @type {Observable>} + * @memberof UmbTreeStore + */ rootItems: Observable>; + + /** + * Returns an observable of the children of the given parent item. + * @param {(string | null)} parentUnique + * @memberof UmbTreeStore + */ childrenOf: (parentUnique: string | null) => Observable>; - // TODO: remove this one when all repositories are using an item store - items: (uniques: Array) => Observable>; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree.context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree.context.ts index e0f5699def..d80ac33eca 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree.context.ts @@ -12,7 +12,7 @@ import { import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api'; import { UmbExtensionApiInitializer } from '@umbraco-cms/backoffice/extension-api'; -import type { ProblemDetails } from '@umbraco-cms/backoffice/backend-api'; +import type { ProblemDetails } from '@umbraco-cms/backoffice/external/backend-api'; import { UmbSelectionManager } from '@umbraco-cms/backoffice/utils'; import type { UmbEntityActionEvent } from '@umbraco-cms/backoffice/entity-action'; import { UmbObjectState } from '@umbraco-cms/backoffice/observable-api'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree.element.ts index 7332f200b3..d62ad4de7b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree.element.ts @@ -1,7 +1,7 @@ import { UmbTreeContextBase } from './tree.context.js'; import type { UmbTreeItemModelBase } from './types.js'; import { html, nothing, customElement, property, state, repeat } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbObserverController } from '@umbraco-cms/backoffice/observable-api'; import './tree-item-default/tree-item.element.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/types.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/types.ts index 3cb1c82e37..0f0d67e0ad 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/types.ts @@ -24,18 +24,7 @@ export interface UmbEntityTreeItemModel extends UmbTreeItemModelBase { parentId: string | null; } -// TODO: remove this when we have unique for everything -export interface UmbFileSystemTreeItemModel extends UmbTreeItemModelBase { - path: string; - isFolder: boolean; -} - // TODO: remove this when we have unique for everything export interface UmbEntityTreeRootModel extends UmbTreeItemModelBase { id: null; } - -// TODO: remove this when we have unique for everything -export interface UmbFileSystemTreeRootModel extends UmbTreeItemModelBase { - path: null; -} diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/unique-tree-item/unique-tree-item.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/unique-tree-item/unique-tree-item.element.ts index e5c15b71ef..33ca00d827 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/unique-tree-item/unique-tree-item.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/unique-tree-item/unique-tree-item.element.ts @@ -2,13 +2,9 @@ import type { UmbUniqueTreeItemModel } from '../types.js'; import { UmbUniqueTreeItemContext } from './unique-tree-item.context.js'; import { css, html, nothing, customElement, property } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; -import type { - UmbBackofficeManifestKind, - UmbTreeItemElement} from '@umbraco-cms/backoffice/extension-registry'; -import { - umbExtensionsRegistry, -} from '@umbraco-cms/backoffice/extension-registry'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; +import type { UmbBackofficeManifestKind, UmbTreeItemElement } from '@umbraco-cms/backoffice/extension-registry'; +import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; // TODO: Move to separate file: const manifest: UmbBackofficeManifestKind = { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/variant-selector/variant-selector.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/variant-selector/variant-selector.element.ts index 1d591f92ea..19f614d289 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/variant-selector/variant-selector.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/variant-selector/variant-selector.element.ts @@ -16,8 +16,8 @@ import { query, } from '@umbraco-cms/backoffice/external/lit'; import { UMB_WORKSPACE_SPLIT_VIEW_CONTEXT, type ActiveVariant } from '@umbraco-cms/backoffice/workspace'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; -import { DocumentVariantStateModel } from '@umbraco-cms/backoffice/backend-api'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; +import { DocumentVariantStateModel } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbDocumentVariantModel } from '@umbraco-cms/backoffice/document'; @customElement('umb-variant-selector') diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action-menu/workspace-action-menu.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action-menu/workspace-action-menu.element.ts index 151c35b201..8293277740 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action-menu/workspace-action-menu.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action-menu/workspace-action-menu.element.ts @@ -1,7 +1,7 @@ import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { css, html, customElement, state, nothing } from '@umbraco-cms/backoffice/external/lit'; import type { UmbActionExecutedEvent } from '@umbraco-cms/backoffice/event'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { UMB_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/workspace'; @customElement('umb-workspace-action-menu') export class UmbWorkspaceActionMenuElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action/workspace-action.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action/workspace-action.element.ts index 3e2403857f..a90f666548 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action/workspace-action.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action/workspace-action.element.ts @@ -3,7 +3,7 @@ import { UmbActionExecutedEvent } from '@umbraco-cms/backoffice/event'; import { css, html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import type { UUIButtonState } from '@umbraco-cms/backoffice/external/uui'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { ManifestWorkspaceAction } from '@umbraco-cms/backoffice/extension-registry'; import { createExtensionApi } from '@umbraco-cms/backoffice/extension-api'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-editor/workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-editor/workspace-editor.element.ts index 0ec3a0831e..a21a32a8c9 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-editor/workspace-editor.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-editor/workspace-editor.element.ts @@ -1,15 +1,11 @@ import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { css, html, nothing, customElement, property, state, repeat } from '@umbraco-cms/backoffice/external/lit'; import type { UmbRoute, UmbRouterSlotInitEvent, UmbRouterSlotChangeEvent } from '@umbraco-cms/backoffice/router'; -import type { - ManifestWorkspaceView, - ManifestWorkspaceViewCollection} from '@umbraco-cms/backoffice/extension-registry'; -import { - umbExtensionsRegistry, -} from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestWorkspaceView } from '@umbraco-cms/backoffice/extension-registry'; +import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; import { UmbExtensionsManifestInitializer, createExtensionElement } from '@umbraco-cms/backoffice/extension-api'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { componentHasManifestProperty } from '@umbraco-cms/backoffice/utils'; /** @@ -38,7 +34,7 @@ export class UmbWorkspaceEditorElement extends UmbLitElement { public enforceNoFooter = false; @state() - private _workspaceViews: Array = []; + private _workspaceViews: Array = []; @state() private _routes?: UmbRoute[]; @@ -51,16 +47,10 @@ export class UmbWorkspaceEditorElement extends UmbLitElement { constructor() { super(); - new UmbExtensionsManifestInitializer( - this, - umbExtensionsRegistry, - ['workspaceView', 'workspaceViewCollection'], - null, - (workspaceViews) => { - this._workspaceViews = workspaceViews.map((view) => view.manifest); - this._createRoutes(); - }, - ); + new UmbExtensionsManifestInitializer(this, umbExtensionsRegistry, ['workspaceView'], null, (workspaceViews) => { + this._workspaceViews = workspaceViews.map((view) => view.manifest); + this._createRoutes(); + }); } private _createRoutes() { @@ -70,14 +60,7 @@ export class UmbWorkspaceEditorElement extends UmbLitElement { this._routes = this._workspaceViews.map((manifest) => { return { path: `view/${manifest.meta.pathname}`, - component: () => { - if (manifest.type === 'workspaceViewCollection') { - return import( - '../../workspace-content/views/collection/workspace-view-collection.element.js' - ) as unknown as Promise; - } - return createExtensionElement(manifest); - }, + component: () => createExtensionElement(manifest), setup: (component) => { if (component && componentHasManifestProperty(component)) { component.manifest = manifest; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-footer/workspace-footer.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-footer/workspace-footer.element.ts index da49d49b5b..d4c8b59ba2 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-footer/workspace-footer.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-footer/workspace-footer.element.ts @@ -2,7 +2,7 @@ import { UMB_SAVEABLE_WORKSPACE_CONTEXT } from '../../saveable-workspace.context import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbModalContext } from '@umbraco-cms/backoffice/modal'; import { UMB_MODAL_CONTEXT } from '@umbraco-cms/backoffice/modal'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-split-view/workspace-split-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-split-view/workspace-split-view.element.ts index ca255488d9..f498ff31b0 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-split-view/workspace-split-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-split-view/workspace-split-view.element.ts @@ -1,7 +1,7 @@ import { UmbWorkspaceSplitViewContext } from './workspace-split-view.context.js'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { css, html, customElement, property } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import '../variant-selector/index.js'; /** * diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-content/views/collection/workspace-view-collection.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-content/views/collection/workspace-view-collection.element.ts deleted file mode 100644 index 2139e178a5..0000000000 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-content/views/collection/workspace-view-collection.element.ts +++ /dev/null @@ -1,50 +0,0 @@ -import { css, html, customElement } from '@umbraco-cms/backoffice/external/lit'; -import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; -import type { UmbDefaultCollectionContext } from '@umbraco-cms/backoffice/collection'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; -import type { ManifestWorkspaceViewCollection } from '@umbraco-cms/backoffice/extension-registry'; -import { UMB_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/workspace'; - -import '../../../../collection/dashboards/dashboard-collection.element.js'; -import type { UmbTreeItemModelBase } from '@umbraco-cms/backoffice/tree'; - -@customElement('umb-workspace-view-collection') -export class UmbWorkspaceViewCollectionElement extends UmbLitElement { - public manifest!: ManifestWorkspaceViewCollection; - - private _workspaceContext?: typeof UMB_WORKSPACE_CONTEXT.TYPE; - - // TODO: add type for the collection context. - private _collectionContext?: UmbDefaultCollectionContext; - - constructor() { - super(); - - this.consumeContext(UMB_WORKSPACE_CONTEXT, (nodeContext) => { - this._workspaceContext = nodeContext; - }); - } - - render() { - // TODO: figure out what the collection to render - return html``; - } - - static styles = [ - UmbTextStyles, - css` - :host { - display: block; - height: 100%; - } - `, - ]; -} - -export default UmbWorkspaceViewCollectionElement; - -declare global { - interface HTMLElementTagNameMap { - 'umb-workspace-view-collection': UmbWorkspaceViewCollectionElement; - } -} diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-context/property-structure-workspace-context.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-context/property-structure-workspace-context.interface.ts index 4c64b25e57..7e8722c7cb 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-context/property-structure-workspace-context.interface.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-context/property-structure-workspace-context.interface.ts @@ -1,6 +1,6 @@ import type { UmbWorkspaceContextInterface } from './workspace-context.interface.js'; import type { Observable } from '@umbraco-cms/backoffice/external/rxjs'; -import type { ValueModelBaseModel } from '@umbraco-cms/backoffice/backend-api'; +import type { ValueModelBaseModel } from '@umbraco-cms/backoffice/external/backend-api'; export interface UmbPropertyStructureWorkspaceContextInterface extends UmbWorkspaceContextInterface { propertyStructureById(id: string): Promise>; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-modal/workspace-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-modal/workspace-modal.element.ts index e5c77d98da..5a9722e24d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-modal/workspace-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-modal/workspace-modal.element.ts @@ -2,7 +2,7 @@ import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import type { CSSResultGroup } from '@umbraco-cms/backoffice/external/lit'; import { css, html, customElement, property } from '@umbraco-cms/backoffice/external/lit'; import type { UmbWorkspaceData } from '@umbraco-cms/backoffice/modal'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-workspace-modal') export class UmbWorkspaceModalElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace.element.ts index 5d8855a140..2fe8960ce6 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace.element.ts @@ -1,6 +1,6 @@ import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { css, html, nothing, customElement, property } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { ManifestWorkspace } from '@umbraco-cms/backoffice/extension-registry'; @customElement('umb-workspace') diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/collection/repository/dictionary-collection.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/collection/repository/dictionary-collection.server.data-source.ts index dc0e8407b5..61aeaedeab 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/collection/repository/dictionary-collection.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/collection/repository/dictionary-collection.server.data-source.ts @@ -1,7 +1,7 @@ import type { UmbDictionaryCollectionFilterModel, UmbDictionaryCollectionModel } from '../types.js'; import { UMB_DICTIONARY_ENTITY_TYPE } from '../../entity.js'; import type { UmbCollectionDataSource } from '@umbraco-cms/backoffice/repository'; -import { DictionaryResource } from '@umbraco-cms/backoffice/backend-api'; +import { DictionaryResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/collection/views/table/dictionary-table-collection-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/collection/views/table/dictionary-table-collection-view.element.ts index 23536e8a93..b1d30916cf 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/collection/views/table/dictionary-table-collection-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/collection/views/table/dictionary-table-collection-view.element.ts @@ -4,7 +4,7 @@ import { UMB_DEFAULT_COLLECTION_CONTEXT } from '@umbraco-cms/backoffice/collecti import type { UmbTableColumn, UmbTableConfig, UmbTableItem } from '@umbraco-cms/backoffice/components'; import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbLanguageDetailModel } from '@umbraco-cms/backoffice/language'; import { UmbLanguageCollectionRepository } from '@umbraco-cms/backoffice/language'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/dashboard/dictionary-overview-dashboard.element.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/dashboard/dictionary-overview-dashboard.element.ts index fc162b8420..6eec2340d2 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/dashboard/dictionary-overview-dashboard.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/dashboard/dictionary-overview-dashboard.element.ts @@ -2,7 +2,7 @@ import { UMB_DICTIONARY_COLLECTION_ALIAS } from '../collection/index.js'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; import type { UmbTableConfig } from '@umbraco-cms/backoffice/components'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-dictionary-collection-dashboard') export class UmbDictionaryCollectionDashboardElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/repository/detail/dictionary-detail.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/repository/detail/dictionary-detail.server.data-source.ts index 4ff2c0e73f..c4a27a99be 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/repository/detail/dictionary-detail.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/repository/detail/dictionary-detail.server.data-source.ts @@ -5,8 +5,8 @@ import type { UmbDetailDataSource } from '@umbraco-cms/backoffice/repository'; import type { CreateDictionaryItemRequestModel, DictionaryItemModelBaseModel, -} from '@umbraco-cms/backoffice/backend-api'; -import { DictionaryResource } from '@umbraco-cms/backoffice/backend-api'; +} from '@umbraco-cms/backoffice/external/backend-api'; +import { DictionaryResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/repository/export/dictionary-export.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/repository/export/dictionary-export.server.data-source.ts index 8c28511dd7..66f3836daa 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/repository/export/dictionary-export.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/repository/export/dictionary-export.server.data-source.ts @@ -1,4 +1,4 @@ -import { DictionaryResource } from '@umbraco-cms/backoffice/backend-api'; +import { DictionaryResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/repository/import/dictionary-import.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/repository/import/dictionary-import.server.data-source.ts index 9623603d81..22e30f59cd 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/repository/import/dictionary-import.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/repository/import/dictionary-import.server.data-source.ts @@ -1,5 +1,5 @@ -import type { ImportDictionaryRequestModel } from '@umbraco-cms/backoffice/backend-api'; -import { DictionaryResource } from '@umbraco-cms/backoffice/backend-api'; +import type { ImportDictionaryRequestModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { DictionaryResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/repository/item/dictionary-item.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/repository/item/dictionary-item.server.data-source.ts index 8a7340c097..77aa221300 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/repository/item/dictionary-item.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/repository/item/dictionary-item.server.data-source.ts @@ -1,8 +1,11 @@ import { UMB_DICTIONARY_ENTITY_TYPE } from '../../entity.js'; import type { UmbDictionaryItemModel } from './types.js'; import { UmbItemServerDataSourceBase } from '@umbraco-cms/backoffice/repository'; -import type { DictionaryItemItemResponseModel, DictionaryItemResponseModel } from '@umbraco-cms/backoffice/backend-api'; -import { DictionaryResource } from '@umbraco-cms/backoffice/backend-api'; +import type { + DictionaryItemItemResponseModel, + DictionaryItemResponseModel, +} from '@umbraco-cms/backoffice/external/backend-api'; +import { DictionaryResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; /** diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/tree/dictionary-tree.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/tree/dictionary-tree.server.data-source.ts index 8bec5aa88c..5e51c39703 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/tree/dictionary-tree.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/tree/dictionary-tree.server.data-source.ts @@ -2,8 +2,8 @@ import { UMB_DICTIONARY_ENTITY_TYPE } from '../entity.js'; import type { UmbDictionaryTreeItemModel } from './types.js'; import { UmbTreeServerDataSourceBase } from '@umbraco-cms/backoffice/tree'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; -import type { NamedEntityTreeItemResponseModel } from '@umbraco-cms/backoffice/backend-api'; -import { DictionaryResource } from '@umbraco-cms/backoffice/backend-api'; +import type { NamedEntityTreeItemResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { DictionaryResource } from '@umbraco-cms/backoffice/external/backend-api'; /** * A data source for the Dictionary tree that fetches data from the server diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/workspace/dictionary-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/workspace/dictionary-workspace-editor.element.ts index 1306902154..f14399008e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/workspace/dictionary-workspace-editor.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/workspace/dictionary-workspace-editor.element.ts @@ -2,7 +2,7 @@ import { UMB_DICTIONARY_WORKSPACE_CONTEXT } from './dictionary-workspace.context import type { UUIInputElement } from '@umbraco-cms/backoffice/external/uui'; import { UUIInputEvent } from '@umbraco-cms/backoffice/external/uui'; import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-dictionary-workspace-editor') export class UmbDictionaryWorkspaceEditorElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/workspace/dictionary-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/workspace/dictionary-workspace.element.ts index 9a1fb5edbd..3ca39441ff 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/workspace/dictionary-workspace.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/workspace/dictionary-workspace.element.ts @@ -3,7 +3,7 @@ import { UmbDictionaryWorkspaceEditorElement } from './dictionary-workspace-edit import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; import type { UmbRoute } from '@umbraco-cms/backoffice/router'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { UmbWorkspaceIsNewRedirectController } from '@umbraco-cms/backoffice/workspace'; @customElement('umb-dictionary-workspace') diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/workspace/views/workspace-view-dictionary-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/workspace/views/workspace-view-dictionary-editor.element.ts index a9f2a9f5e0..73004ba59e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/workspace/views/workspace-view-dictionary-editor.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/workspace/views/workspace-view-dictionary-editor.element.ts @@ -3,7 +3,7 @@ import type { UmbDictionaryDetailModel } from '../../types.js'; import type { UUITextareaElement } from '@umbraco-cms/backoffice/external/uui'; import { UUITextareaEvent } from '@umbraco-cms/backoffice/external/uui'; import { css, html, customElement, state, repeat, ifDefined, unsafeHTML } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { UmbLanguageCollectionRepository, type UmbLanguageDetailModel } from '@umbraco-cms/backoffice/language'; @customElement('umb-workspace-view-dictionary-editor') diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/dashboards/redirect-management/dashboard-redirect-management.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/dashboards/redirect-management/dashboard-redirect-management.element.ts index e26b0605a3..20e98a216d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/dashboards/redirect-management/dashboard-redirect-management.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/dashboards/redirect-management/dashboard-redirect-management.element.ts @@ -1,14 +1,10 @@ import type { UUIButtonState, UUIPaginationElement, UUIPaginationEvent } from '@umbraco-cms/backoffice/external/uui'; import { css, html, nothing, customElement, state, query, property } from '@umbraco-cms/backoffice/external/lit'; -import type { UmbModalManagerContext} from '@umbraco-cms/backoffice/modal'; +import type { UmbModalManagerContext } from '@umbraco-cms/backoffice/modal'; import { UMB_MODAL_MANAGER_CONTEXT, UMB_CONFIRM_MODAL } from '@umbraco-cms/backoffice/modal'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; -import type { - RedirectUrlResponseModel} from '@umbraco-cms/backoffice/backend-api'; -import { - RedirectManagementResource, - RedirectStatusModel -} from '@umbraco-cms/backoffice/backend-api'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; +import type { RedirectUrlResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { RedirectManagementResource, RedirectStatusModel } from '@umbraco-cms/backoffice/external/backend-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-blueprints/index.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-blueprints/index.ts new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/components/input-document-type/input-document-type.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/components/input-document-type/input-document-type.element.ts index 21f716f144..aac219c253 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/components/input-document-type/input-document-type.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/components/input-document-type/input-document-type.element.ts @@ -11,7 +11,7 @@ import { nothing, } from '@umbraco-cms/backoffice/external/lit'; import { FormControlMixin } from '@umbraco-cms/backoffice/external/uui'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { splitStringToArray } from '@umbraco-cms/backoffice/utils'; import { UMB_WORKSPACE_MODAL, UmbModalRouteRegistrationController } from '@umbraco-cms/backoffice/modal'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/index.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/index.ts index 4a54461e21..7dafabe4cf 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/index.ts @@ -6,3 +6,5 @@ export * from './workspace/index.js'; export * from './repository/index.js'; export * from './tree/types.js'; export * from './types.js'; + +export * from './modals/index.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/manifests.ts index f1a81fd7d1..6da5e3f738 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/manifests.ts @@ -5,6 +5,8 @@ import { manifests as repositoryManifests } from './repository/manifests.js'; import { manifests as treeManifests } from './tree/manifests.js'; import { manifests as workspaceManifests } from './workspace/manifests.js'; +import { manifests as modalManifests } from './modals/manifests.js'; + export const manifests = [ ...entityActionsManifests, ...menuItemManifests, @@ -12,4 +14,5 @@ export const manifests = [ ...repositoryManifests, ...treeManifests, ...workspaceManifests, + ...modalManifests, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/modals/composition-picker/composition-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/modals/composition-picker/composition-picker-modal.element.ts new file mode 100644 index 0000000000..2ead4db13a --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/modals/composition-picker/composition-picker-modal.element.ts @@ -0,0 +1,208 @@ +import { UmbDocumentTypeCompositionRepository } from '../../repository/index.js'; +import type { + UmbCompositionPickerModalData, + UmbCompositionPickerModalValue, +} from './composition-picker-modal.token.js'; +import { css, html, customElement, state, repeat, nothing } from '@umbraco-cms/backoffice/external/lit'; +import { UmbModalBaseElement } from '@umbraco-cms/backoffice/modal'; +import type { + UmbDocumentTypeCompositionCompatibleModel, + UmbDocumentTypeCompositionReferenceModel, +} from '@umbraco-cms/backoffice/document-type'; + +interface CompatibleCompositions { + path: string; + compositions: Array; +} + +@customElement('umb-composition-picker-modal') +export class UmbCompositionPickerModalElement extends UmbModalBaseElement< + UmbCompositionPickerModalData, + UmbCompositionPickerModalValue +> { + #compositionRepository = new UmbDocumentTypeCompositionRepository(this); + #unique?: string; + + @state() + private _references: Array = []; + + @state() + private _compatibleCompositions?: Array; + + @state() + private _selection: Array = []; + + connectedCallback() { + super.connectedCallback(); + + this._selection = this.data?.selection ?? []; + this.modalContext?.setValue({ selection: this._selection }); + + this.#requestReference(); + } + + async #requestReference() { + this.#unique = this.data?.unique; + if (!this.#unique) return; + + const { data } = await this.#compositionRepository.getReferences(this.#unique); + + this._references = data ?? []; + + if (!this._references.length) { + this.#requestAvailableCompositions(); + } + } + + async #requestAvailableCompositions() { + if (!this.#unique) return; + + const isElement = this.data?.isElement; + const currentPropertyAliases = this.data?.currentPropertyAliases; + + const { data } = await this.#compositionRepository.availableCompositions({ + unique: this.#unique, + isElement: isElement ?? false, + currentCompositeUniques: this._selection, + currentPropertyAliases: currentPropertyAliases ?? [], + }); + + if (!data) return; + + const folders = Array.from(new Set(data.map((c) => '/' + c.folderPath.join('/')))); + this._compatibleCompositions = folders.map((path) => ({ + path, + compositions: data.filter((c) => '/' + c.folderPath.join('/') === path), + })); + } + + render() { + return html` + + ${this._references.length ? this.#renderHasReference() : this.#renderAvailableCompositions()} +
+ + ${!this._references.length + ? html`` + : nothing} +
+ + `; + } + + #renderHasReference() { + return html` + This Content Type is used in a composition, and therefore cannot be composed itself. + +

+ Where is this composition used? +

+ + This composition is currently used in the composition of the following Content Types: + +
+ ${repeat( + this._references, + (item) => item.unique, + (item) => + html` + + `, + )} +
`; + } + + #renderAvailableCompositions() { + if (this._compatibleCompositions) { + return html` + Inherit tabs and properties from an existing Document Type. New tabs will be
added to the current + Document Type or merged if a tab with an identical name exists.
+ + +
+ ${repeat( + this._compatibleCompositions, + (folder) => folder.path, + (folder) => + html`${this._compatibleCompositions!.length > 1 + ? html`${folder.path}` + : nothing} + ${this.#renderCompositionsItems(folder.compositions)}`, + )} +
`; + } else { + return html` + There are no Content Types available to use as a composition + `; + } + } + + #onSelectionAdd(unique: string) { + this._selection = [...this._selection, unique]; + this.modalContext?.setValue({ selection: this._selection }); + } + + #onSelectionRemove(unique: string) { + this._selection = this._selection.filter((s) => s !== unique); + this.modalContext?.setValue({ selection: this._selection }); + } + + #renderCompositionsItems(compositionsList: Array) { + return repeat( + compositionsList, + (compositions) => compositions.unique, + (compositions) => + html` this.#onSelectionAdd(compositions.unique)} + @deselected=${() => this.#onSelectionRemove(compositions.unique)} + ?selected=${this._selection.find((unique) => unique === compositions.unique)}> + + `, + ); + } + + static styles = [ + css` + uui-input { + margin: var(--uui-size-6) 0; + display: flex; + align-items: center; + } + + #search uui-icon { + padding-left: var(--uui-size-3); + } + + .reference-list { + margin-block: var(--uui-size-3); + display: grid; + gap: var(--uui-size-1); + } + + .compositions-list strong { + display: flex; + align-items: center; + gap: var(--uui-size-3); + } + `, + ]; +} + +export default UmbCompositionPickerModalElement; + +declare global { + interface HTMLElementTagNameMap { + 'umb-composition-picker-modal': UmbCompositionPickerModalElement; + } +} diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/modals/composition-picker/composition-picker-modal.token.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/modals/composition-picker/composition-picker-modal.token.ts new file mode 100644 index 0000000000..7a006e6642 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/modals/composition-picker/composition-picker-modal.token.ts @@ -0,0 +1,23 @@ +import { UmbModalToken } from '@umbraco-cms/backoffice/modal'; + +export interface UmbCompositionPickerModalData { + selection: Array; + unique: string; + //Do we really need to send this to the server - Why isn't unique enough? + isElement: boolean; + currentPropertyAliases: Array; +} + +export interface UmbCompositionPickerModalValue { + selection: Array; +} + +export const UMB_COMPOSITION_PICKER_MODAL = new UmbModalToken< + UmbCompositionPickerModalData, + UmbCompositionPickerModalValue +>('Umb.Modal.CompositionPicker', { + modal: { + type: 'sidebar', + size: 'small', + }, +}); diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/modals/composition-picker/index.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/modals/composition-picker/index.ts new file mode 100644 index 0000000000..653c14e841 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/modals/composition-picker/index.ts @@ -0,0 +1,2 @@ +export * from './composition-picker-modal.element.js'; +export * from './composition-picker-modal.token.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/modals/index.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/modals/index.ts new file mode 100644 index 0000000000..bda362c82e --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/modals/index.ts @@ -0,0 +1 @@ +export * from './composition-picker/index.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/modals/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/modals/manifests.ts new file mode 100644 index 0000000000..9d3ad5e18f --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/modals/manifests.ts @@ -0,0 +1,12 @@ +import type { ManifestModal } from '@umbraco-cms/backoffice/extension-registry'; + +const modals: Array = [ + { + type: 'modal', + alias: 'Umb.Modal.CompositionPicker', + name: 'Block Catalogue Modal', + js: () => import('./composition-picker/composition-picker-modal.element.js'), + }, +]; + +export const manifests = [...modals]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/property-editors/document-type-picker/property-editor-ui-document-type-picker.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/property-editors/document-type-picker/property-editor-ui-document-type-picker.element.ts index bea3fc4445..f7c7c37b07 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/property-editors/document-type-picker/property-editor-ui-document-type-picker.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/property-editors/document-type-picker/property-editor-ui-document-type-picker.element.ts @@ -1,7 +1,7 @@ import type { UmbInputDocumentTypeElement } from '../../components/input-document-type/input-document-type.element.js'; import { html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit'; import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor'; @customElement('umb-property-editor-ui-document-type-picker') diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/composition/document-type-composition.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/composition/document-type-composition.repository.ts new file mode 100644 index 0000000000..1901072d48 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/composition/document-type-composition.repository.ts @@ -0,0 +1,21 @@ +import { UmbDocumentTypeCompositionServerDataSource } from './document-type-composition.server.data-source.js'; +import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; +import type { UmbDocumentTypeCompositionRequestModel } from '@umbraco-cms/backoffice/document-type'; +import { UmbRepositoryBase } from '@umbraco-cms/backoffice/repository'; + +export class UmbDocumentTypeCompositionRepository extends UmbRepositoryBase { + #compositionSource: UmbDocumentTypeCompositionServerDataSource; + + constructor(host: UmbControllerHost) { + super(host); + this.#compositionSource = new UmbDocumentTypeCompositionServerDataSource(this); + } + + async getReferences(unique: string) { + return this.#compositionSource.getReferences(unique); + } + + async availableCompositions(args: UmbDocumentTypeCompositionRequestModel) { + return this.#compositionSource.availableCompositions(args); + } +} diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/composition/document-type-composition.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/composition/document-type-composition.server.data-source.ts new file mode 100644 index 0000000000..e49f351ddc --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/composition/document-type-composition.server.data-source.ts @@ -0,0 +1,82 @@ +import type { + UmbDocumentTypeCompositionCompatibleModel, + UmbDocumentTypeCompositionReferenceModel, + UmbDocumentTypeCompositionRequestModel, +} from '../../types.js'; +import { + type DocumentTypeCompositionRequestModel, + DocumentTypeResource, +} from '@umbraco-cms/backoffice/external/backend-api'; +import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; +import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; + +/** + * A data source for the Document Type Composition that fetches data from the server + * @export + * @class UmbDocumentTypeCompositionServerDataSource + */ +export class UmbDocumentTypeCompositionServerDataSource { + #host: UmbControllerHost; + + /** + * Creates an instance of UmbDocumentTypeCompositionServerDataSource. + * @param {UmbControllerHost} host + * @memberof UmbDocumentTypeCompositionServerDataSource + */ + constructor(host: UmbControllerHost) { + this.#host = host; + } + /** + * Fetches the compatible compositions for a document type from the server + * @param {string} unique + * @return {*} + * @memberof UmbDocumentTypeCompositionServerDataSource + */ + async getReferences(unique: string) { + const response = await tryExecuteAndNotify( + this.#host, + DocumentTypeResource.getDocumentTypeByIdCompositionReferences({ id: unique }), + ); + const error = response.error; + const data: Array | undefined = response.data?.map((reference) => { + return { + unique: reference.id, + icon: reference.icon, + name: reference.name, + }; + }); + + return { data, error }; + } + /** + * Updates the compositions for a document type on the server + * @param {DocumentTypeCompositionRequestModel} requestBody + * @return {*} + * @memberof UmbDocumentTypeCompositionServerDataSource + */ + async availableCompositions(args: UmbDocumentTypeCompositionRequestModel) { + const requestBody: DocumentTypeCompositionRequestModel = { + id: args.unique, + isElement: args.isElement, + currentCompositeIds: args.currentCompositeUniques, + currentPropertyAliases: args.currentPropertyAliases, + }; + + const response = await tryExecuteAndNotify( + this.#host, + DocumentTypeResource.postDocumentTypeAvailableCompositions({ requestBody }), + ); + const error = response.error; + const data: Array | undefined = response.data?.map((composition) => { + return { + unique: composition.id, + name: composition.name, + icon: composition.icon, + folderPath: composition.folderPath, + isCompatible: composition.isCompatible, + }; + }); + + return { data, error }; + } +} diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/composition/index.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/composition/index.ts new file mode 100644 index 0000000000..99c179ec94 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/composition/index.ts @@ -0,0 +1,2 @@ +export { UmbDocumentTypeCompositionRepository } from './document-type-composition.repository.js'; +export { UMB_DOCUMENT_TYPE_COMPOSITION_REPOSITORY_ALIAS } from './manifests.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/composition/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/composition/manifests.ts new file mode 100644 index 0000000000..eb98332a8e --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/composition/manifests.ts @@ -0,0 +1,13 @@ +import { UmbDocumentTypeCompositionRepository } from './document-type-composition.repository.js'; +import type { ManifestRepository } from '@umbraco-cms/backoffice/extension-registry'; + +export const UMB_DOCUMENT_TYPE_COMPOSITION_REPOSITORY_ALIAS = 'Umb.Repository.DocumentType.Composition'; + +const queryRepository: ManifestRepository = { + type: 'repository', + alias: UMB_DOCUMENT_TYPE_COMPOSITION_REPOSITORY_ALIAS, + name: 'Document Type Composition Repository', + api: UmbDocumentTypeCompositionRepository, +}; + +export const manifests = [queryRepository]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/detail/document-type-detail.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/detail/document-type-detail.server.data-source.ts index 7042af6b84..1fbd784718 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/detail/document-type-detail.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/detail/document-type-detail.server.data-source.ts @@ -5,8 +5,8 @@ import type { UmbDetailDataSource } from '@umbraco-cms/backoffice/repository'; import type { CreateDocumentTypeRequestModel, UpdateDocumentTypeRequestModel, -} from '@umbraco-cms/backoffice/backend-api'; -import { DocumentTypeResource } from '@umbraco-cms/backoffice/backend-api'; +} from '@umbraco-cms/backoffice/external/backend-api'; +import { DocumentTypeResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; import type { UmbPropertyTypeContainerModel } from '@umbraco-cms/backoffice/content-type'; @@ -143,6 +143,7 @@ export class UmbDocumentTypeDetailServerDataSource implements UmbDetailDataSourc // TODO: make data mapper to prevent errors const requestBody: CreateDocumentTypeRequestModel = { + folder: model.parentUnique ? { id: model.parentUnique } : null, alias: model.alias, name: model.name, description: model.description, diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/index.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/index.ts index 5abd54bbee..60ef7a8f2d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/index.ts @@ -1,3 +1,4 @@ export * from './detail/index.js'; export * from './item/index.js'; export * from './structure/index.js'; +export * from './composition/index.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/item/document-type-item.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/item/document-type-item.server.data-source.ts index 982b103de5..608de5c6d7 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/item/document-type-item.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/item/document-type-item.server.data-source.ts @@ -1,7 +1,7 @@ import type { UmbDocumentTypeItemModel } from './types.js'; import { UmbItemServerDataSourceBase } from '@umbraco-cms/backoffice/repository'; -import type { DocumentTypeItemResponseModel } from '@umbraco-cms/backoffice/backend-api'; -import { DocumentTypeResource } from '@umbraco-cms/backoffice/backend-api'; +import type { DocumentTypeItemResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { DocumentTypeResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; /** diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/manifests.ts index bb35952020..38273b6d7d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/manifests.ts @@ -1,4 +1,5 @@ import { manifests as detailManifests } from './detail/manifests.js'; import { manifests as itemManifests } from './item/manifests.js'; +import { manifests as compositionManifests } from './composition/manifests.js'; -export const manifests = [...detailManifests, ...itemManifests]; +export const manifests = [...detailManifests, ...itemManifests, ...compositionManifests]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/structure/document-type-structure.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/structure/document-type-structure.server.data-source.ts index a4b3dcfab0..1a4dc8b280 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/structure/document-type-structure.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/repository/structure/document-type-structure.server.data-source.ts @@ -1,6 +1,6 @@ import type { UmbAllowedDocumentTypeModel } from './types.js'; -import type { AllowedDocumentTypeModel } from '@umbraco-cms/backoffice/backend-api'; -import { DocumentTypeResource } from '@umbraco-cms/backoffice/backend-api'; +import type { AllowedDocumentTypeModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { DocumentTypeResource } from '@umbraco-cms/backoffice/external/backend-api'; import { UmbContentTypeStructureServerDataSourceBase } from '@umbraco-cms/backoffice/content-type'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/document-type.tree.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/document-type.tree.server.data-source.ts index 0c1b601301..4aa07032c0 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/document-type.tree.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/document-type.tree.server.data-source.ts @@ -1,8 +1,8 @@ import { UMB_DOCUMENT_TYPE_ENTITY_TYPE, UMB_DOCUMENT_TYPE_FOLDER_ENTITY_TYPE } from '../entity.js'; import type { UmbDocumentTypeTreeItemModel } from './types.js'; import { UmbTreeServerDataSourceBase } from '@umbraco-cms/backoffice/tree'; -import type { DocumentTypeTreeItemResponseModel } from '@umbraco-cms/backoffice/backend-api'; -import { DocumentTypeResource } from '@umbraco-cms/backoffice/backend-api'; +import type { DocumentTypeTreeItemResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { DocumentTypeResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; /** diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/folder/document-type-folder.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/folder/document-type-folder.server.data-source.ts index b2304a1d3a..ed781dd616 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/folder/document-type-folder.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/folder/document-type-folder.server.data-source.ts @@ -1,5 +1,5 @@ import type { UmbCreateFolderModel, UmbFolderDataSource, UmbUpdateFolderModel } from '@umbraco-cms/backoffice/tree'; -import { DocumentTypeResource } from '@umbraco-cms/backoffice/backend-api'; +import { DocumentTypeResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/types.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/types.ts index b680a5c8ff..6f3dad4ddd 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/types.ts @@ -1,6 +1,6 @@ import type { UmbDocumentTypeEntityType } from './entity.js'; import type { UmbContentTypeModel } from '@umbraco-cms/backoffice/content-type'; -import type { ContentTypeCleanupBaseModel } from '@umbraco-cms/backoffice/backend-api'; +import type { ContentTypeCleanupBaseModel } from '@umbraco-cms/backoffice/external/backend-api'; export interface UmbDocumentTypeDetailModel extends UmbContentTypeModel { entityType: UmbDocumentTypeEntityType; @@ -8,3 +8,25 @@ export interface UmbDocumentTypeDetailModel extends UmbContentTypeModel { defaultTemplate: { id: string } | null; cleanup: ContentTypeCleanupBaseModel; } + +export interface UmbDocumentTypeCompositionRequestModel { + unique: string; + //Do we really need to send this to the server - Why isn't unique enough? + isElement: boolean; + currentPropertyAliases: Array; + currentCompositeUniques: Array; +} + +export interface UmbDocumentTypeCompositionCompatibleModel { + unique: string; + name: string; + icon: string; + folderPath: Array; + isCompatible: boolean; +} + +export interface UmbDocumentTypeCompositionReferenceModel { + unique: string; + name: string; + icon: string; +} diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/document-type-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/document-type-workspace-editor.element.ts index b2440ae46b..30754a156d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/document-type-workspace-editor.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/document-type-workspace-editor.element.ts @@ -1,14 +1,10 @@ import { UMB_DOCUMENT_TYPE_WORKSPACE_CONTEXT } from './document-type-workspace.context-token.js'; -import type { UUIInputElement} from '@umbraco-cms/backoffice/external/uui'; +import type { UUIInputElement } from '@umbraco-cms/backoffice/external/uui'; import { UUIInputEvent } from '@umbraco-cms/backoffice/external/uui'; import { css, html, customElement, state, ifDefined } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; -import type { - UmbModalManagerContext} from '@umbraco-cms/backoffice/modal'; -import { - UMB_MODAL_MANAGER_CONTEXT, - UMB_ICON_PICKER_MODAL, -} from '@umbraco-cms/backoffice/modal'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; +import type { UmbModalManagerContext } from '@umbraco-cms/backoffice/modal'; +import { UMB_MODAL_MANAGER_CONTEXT, UMB_ICON_PICKER_MODAL } from '@umbraco-cms/backoffice/modal'; import { generateAlias } from '@umbraco-cms/backoffice/utils'; @customElement('umb-document-type-workspace-editor') export class UmbDocumentTypeWorkspaceEditorElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/document-type-workspace-sorter.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/document-type-workspace-sorter.ts index 2f139aec68..a1d06df80f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/document-type-workspace-sorter.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/document-type-workspace-sorter.ts @@ -1,4 +1,4 @@ -import type { PropertyTypeContainerModelBaseModel } from '@umbraco-cms/backoffice/backend-api'; +import type { PropertyTypeContainerModelBaseModel } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbSorterConfig } from '@umbraco-cms/backoffice/sorter'; const SORTER_CONFIG_HORIZONTAL: UmbSorterConfig = { diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/document-type-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/document-type-workspace.element.ts index aeb75ba0d7..0b3e9b63ce 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/document-type-workspace.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/document-type-workspace.element.ts @@ -3,7 +3,7 @@ import { UmbDocumentTypeWorkspaceEditorElement } from './document-type-workspace import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; import type { UmbRoute } from '@umbraco-cms/backoffice/router'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { UmbWorkspaceIsNewRedirectController } from '@umbraco-cms/backoffice/workspace'; @customElement('umb-document-type-workspace') diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/views/design/document-type-workspace-view-edit-properties.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/views/design/document-type-workspace-view-edit-properties.element.ts index 111f6c5a85..4b748aab47 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/views/design/document-type-workspace-view-edit-properties.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/views/design/document-type-workspace-view-edit-properties.element.ts @@ -1,3 +1,4 @@ +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbDocumentTypeWorkspaceContext } from '../../document-type-workspace.context.js'; import './document-type-workspace-view-edit-property.element.js'; import type { UmbDocumentTypeDetailModel } from '../../../types.js'; @@ -6,10 +7,9 @@ import { css, html, customElement, property, state, repeat, ifDefined } from '@u import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import type { UmbPropertyContainerTypes, UmbPropertyTypeModel } from '@umbraco-cms/backoffice/content-type'; import { UmbContentTypePropertyStructureHelper } from '@umbraco-cms/backoffice/content-type'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbSorterController } from '@umbraco-cms/backoffice/sorter'; import { UMB_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/workspace'; import { UMB_PROPERTY_SETTINGS_MODAL, UmbModalRouteRegistrationController } from '@umbraco-cms/backoffice/modal'; -import { UmbSorterController } from '@umbraco-cms/backoffice/sorter'; @customElement('umb-document-type-workspace-view-edit-properties') export class UmbDocumentTypeWorkspaceViewEditPropertiesElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/views/design/document-type-workspace-view-edit-property.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/views/design/document-type-workspace-view-edit-property.element.ts index 7ddb177b2a..adcfd0a020 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/views/design/document-type-workspace-view-edit-property.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/views/design/document-type-workspace-view-edit-property.element.ts @@ -10,7 +10,7 @@ import { UMB_WORKSPACE_MODAL, UmbModalRouteRegistrationController, } from '@umbraco-cms/backoffice/modal'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { generateAlias } from '@umbraco-cms/backoffice/utils'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import type { UmbPropertyTypeModel, UmbPropertyTypeScaffoldModel } from '@umbraco-cms/backoffice/content-type'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/views/design/document-type-workspace-view-edit-tab.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/views/design/document-type-workspace-view-edit-tab.element.ts index 4dc44c752a..9561e7d2e2 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/views/design/document-type-workspace-view-edit-tab.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/views/design/document-type-workspace-view-edit-tab.element.ts @@ -1,3 +1,4 @@ +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbDocumentTypeDetailModel } from '../../../types.js'; import type { UmbDocumentTypeWorkspaceContext } from '../../document-type-workspace.context.js'; import type { UmbDocumentTypeWorkspaceViewEditPropertiesElement } from './document-type-workspace-view-edit-properties.element.js'; @@ -7,7 +8,6 @@ import { UmbContentTypeContainerStructureHelper, type UmbPropertyTypeContainerModel, } from '@umbraco-cms/backoffice/content-type'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; import { UMB_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/workspace'; import './document-type-workspace-view-edit-properties.element.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/views/design/document-type-workspace-view-edit.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/views/design/document-type-workspace-view-edit.element.ts index 008d727755..ed87e54d02 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/views/design/document-type-workspace-view-edit.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/views/design/document-type-workspace-view-edit.element.ts @@ -1,3 +1,4 @@ +import { UMB_COMPOSITION_PICKER_MODAL, type UmbCompositionPickerModalData } from '../../../modals/index.js'; import type { UmbDocumentTypeWorkspaceContext } from '../../document-type-workspace.context.js'; import type { UmbDocumentTypeDetailModel } from '../../../types.js'; import type { UmbDocumentTypeWorkspaceViewEditTabElement } from './document-type-workspace-view-edit-tab.element.js'; @@ -5,8 +6,11 @@ import { css, html, customElement, state, repeat, nothing, ifDefined } from '@um import type { UUIInputElement, UUIInputEvent, UUITabElement } from '@umbraco-cms/backoffice/external/uui'; import { UmbContentTypeContainerStructureHelper } from '@umbraco-cms/backoffice/content-type'; import { encodeFolderName } from '@umbraco-cms/backoffice/router'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; -import type { PropertyTypeContainerModelBaseModel } from '@umbraco-cms/backoffice/backend-api'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; +import { + CompositionTypeModel, + type PropertyTypeContainerModelBaseModel, +} from '@umbraco-cms/backoffice/external/backend-api'; import { UMB_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/workspace'; import type { UmbRoute, UmbRouterSlotChangeEvent, UmbRouterSlotInitEvent } from '@umbraco-cms/backoffice/router'; import type { UmbWorkspaceViewElement } from '@umbraco-cms/backoffice/extension-registry'; @@ -77,6 +81,9 @@ export class UmbDocumentTypeWorkspaceViewEditElement extends UmbLitElement imple private _modalManagerContext?: typeof UMB_MODAL_MANAGER_CONTEXT.TYPE; + @state() + private _compositionConfiguration?: UmbCompositionPickerModalData; + constructor() { super(); @@ -106,6 +113,19 @@ export class UmbDocumentTypeWorkspaceViewEditElement extends UmbLitElement imple }, '_observeIsSorting', ); + + const unique = this._workspaceContext.getEntityId(); + + //TODO Figure out the correct data that needs to be sent to the compositions modal. Do we really have to send isElement, currentPropertyAliases - isn't unique enough? + this.observe(this._workspaceContext.structure.contentTypes, (contentTypes) => { + this._compositionConfiguration = { + unique: unique ?? '', + selection: contentTypes.map((contentType) => contentType.unique).filter((id) => id !== unique), + isElement: contentTypes.find((contentType) => contentType.unique === unique)?.isElement ?? false, + currentPropertyAliases: [], + }; + }); + this._observeRootGroups(); }); @@ -256,6 +276,21 @@ export class UmbDocumentTypeWorkspaceViewEditElement extends UmbLitElement imple window.history.replaceState(null, '', this._routerPath + '/tab/' + encodeFolderName(newName)); } + async #openCompositionModal() { + const modalContext = this._modalManagerContext?.open(UMB_COMPOSITION_PICKER_MODAL, { + data: this._compositionConfiguration, + }); + await modalContext?.onSubmit(); + + if (!modalContext?.value) return; + + const compositionIds = modalContext.getValue().selection; + + this._workspaceContext?.setCompositions( + compositionIds.map((unique) => ({ contentType: { unique }, compositionType: CompositionTypeModel.COMPOSITION })), + ); + } + render() { return html` @@ -292,7 +327,11 @@ export class UmbDocumentTypeWorkspaceViewEditElement extends UmbLitElement imple : this.localize.term('general_reorder'); return html`
- + ${this.localize.term('contentTypeEditor_compositions')} diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/views/settings/document-type-workspace-view-settings.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/views/settings/document-type-workspace-view-settings.element.ts index 0c732edd0f..5e5e55f6be 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/views/settings/document-type-workspace-view-settings.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/views/settings/document-type-workspace-view-settings.element.ts @@ -2,7 +2,7 @@ import type { UmbDocumentTypeWorkspaceContext } from '../../document-type-worksp import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import type { UUIToggleElement } from '@umbraco-cms/backoffice/external/uui'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { UMB_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/workspace'; import type { UmbWorkspaceViewElement } from '@umbraco-cms/backoffice/extension-registry'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/views/structure/document-type-workspace-view-structure.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/views/structure/document-type-workspace-view-structure.element.ts index f09d83e334..6cbd3433e5 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/views/structure/document-type-workspace-view-structure.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/views/structure/document-type-workspace-view-structure.element.ts @@ -3,7 +3,7 @@ import type { UmbInputDocumentTypeElement } from '../../../components/input-docu import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import type { UUIToggleElement } from '@umbraco-cms/backoffice/external/uui'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { UMB_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/workspace'; import type { UmbWorkspaceViewElement } from '@umbraco-cms/backoffice/extension-registry'; import type { UmbContentTypeSortModel } from '@umbraco-cms/backoffice/content-type'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/views/templates/document-type-workspace-view-templates.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/views/templates/document-type-workspace-view-templates.element.ts index 039068f1c4..101f5df324 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/views/templates/document-type-workspace-view-templates.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/views/templates/document-type-workspace-view-templates.element.ts @@ -1,12 +1,13 @@ import type { UmbDocumentTypeWorkspaceContext } from '../../document-type-workspace.context.js'; -import type { UmbInputTemplateElement } from '../../../../../templating/templates/components/input-template/input-template.element.js'; -import '../../../../../templating/templates/components/input-template/input-template.element.js'; +import type { UmbInputTemplateElement } from '@umbraco-cms/backoffice/template'; import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { UMB_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/workspace'; import type { UmbWorkspaceViewElement } from '@umbraco-cms/backoffice/extension-registry'; +import '@umbraco-cms/backoffice/template'; // TODO: This is needed to register the element, but it should be done in a better way without importing the whole module. + @customElement('umb-document-type-workspace-view-templates') export class UmbDocumentTypeWorkspaceViewTemplatesElement extends UmbLitElement implements UmbWorkspaceViewElement { #workspaceContext?: UmbDocumentTypeWorkspaceContext; @@ -61,12 +62,12 @@ export class UmbDocumentTypeWorkspaceViewTemplatesElement extends UmbLitElement } render() { - return html` - -
Choose which templates editors are allowed to use on content of this type
+ return html` + +
${this.localize.term('contentTypeEditor_allowedTemplatesDescription')}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/views/table/document-table-collection-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/views/table/document-table-collection-view.element.ts index f7c84cb97c..d5631db653 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/views/table/document-table-collection-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/views/table/document-table-collection-view.element.ts @@ -13,7 +13,7 @@ import type { } from '@umbraco-cms/backoffice/components'; import type { UmbDefaultCollectionContext } from '@umbraco-cms/backoffice/collection'; import { UMB_DEFAULT_COLLECTION_CONTEXT } from '@umbraco-cms/backoffice/collection'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import './column-layouts/document-table-actions-column-layout.element.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/components/input-document-granular-permission/input-document-granular-permission.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/components/input-document-granular-permission/input-document-granular-permission.element.ts index ac5a92dcb6..a34ff5248e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/components/input-document-granular-permission/input-document-granular-permission.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/components/input-document-granular-permission/input-document-granular-permission.element.ts @@ -5,7 +5,7 @@ import { css, html, customElement, property, state } from '@umbraco-cms/backoffi import { FormControlMixin } from '@umbraco-cms/backoffice/external/uui'; import type { UmbModalManagerContext } from '@umbraco-cms/backoffice/modal'; import { UMB_MODAL_MANAGER_CONTEXT, UMB_DOCUMENT_PICKER_MODAL } from '@umbraco-cms/backoffice/modal'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { UmbChangeEvent } from '@umbraco-cms/backoffice/event'; import type { UmbObserverController } from '@umbraco-cms/backoffice/observable-api'; import { splitStringToArray } from '@umbraco-cms/backoffice/utils'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/components/input-document-root-picker/input-document-root-picker.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/components/input-document-root-picker/input-document-root-picker.element.ts index 676da25c69..540ebc06f4 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/components/input-document-root-picker/input-document-root-picker.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/components/input-document-root-picker/input-document-root-picker.element.ts @@ -2,7 +2,7 @@ import { html, css, customElement, property, ifDefined, state, repeat } from '@u import { FormControlMixin } from '@umbraco-cms/backoffice/external/uui'; import { UmbChangeEvent } from '@umbraco-cms/backoffice/event'; import { UmbId } from '@umbraco-cms/backoffice/id'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { UmbSorterController } from '@umbraco-cms/backoffice/sorter'; import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/components/input-document/input-document.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/components/input-document/input-document.element.ts index e6bf58e24b..2d5f350910 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/components/input-document/input-document.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/components/input-document/input-document.element.ts @@ -2,7 +2,7 @@ import type { UmbDocumentTreeItemModel } from '../../tree/types.js'; import { UmbDocumentPickerContext } from './input-document.context.js'; import { css, html, customElement, property, state, ifDefined, repeat } from '@umbraco-cms/backoffice/external/lit'; import { FormControlMixin } from '@umbraco-cms/backoffice/external/uui'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { splitStringToArray } from '@umbraco-cms/backoffice/utils'; import { UMB_WORKSPACE_MODAL, UmbModalRouteRegistrationController } from '@umbraco-cms/backoffice/modal'; import { UmbSorterController } from '@umbraco-cms/backoffice/sorter'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/modal/culture-and-hostnames-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/modal/culture-and-hostnames-modal.element.ts index 086c95dbf2..c4e8437bda 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/modal/culture-and-hostnames-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/modal/culture-and-hostnames-modal.element.ts @@ -3,7 +3,7 @@ import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { UmbModalBaseElement } from '@umbraco-cms/backoffice/modal'; import type { UmbLanguageDetailModel } from '@umbraco-cms/backoffice/language'; import { UmbLanguageCollectionRepository } from '@umbraco-cms/backoffice/language'; -import type { DomainPresentationModel } from '@umbraco-cms/backoffice/backend-api'; +import type { DomainPresentationModel } from '@umbraco-cms/backoffice/external/backend-api'; import { UmbDocumentCultureAndHostnamesRepository, type UmbCultureAndHostnamesModalData, diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/modal/culture-and-hostnames-modal.token.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/modal/culture-and-hostnames-modal.token.ts index b6c802805a..e3aabe66b9 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/modal/culture-and-hostnames-modal.token.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/modal/culture-and-hostnames-modal.token.ts @@ -1,4 +1,4 @@ -import type { DomainPresentationModel } from '@umbraco-cms/backoffice/backend-api'; +import type { DomainPresentationModel } from '@umbraco-cms/backoffice/external/backend-api'; import { UmbModalToken } from '@umbraco-cms/backoffice/modal'; export interface UmbCultureAndHostnamesModalData { diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/culture-and-hostnames.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/culture-and-hostnames.repository.ts index 219c5a75f6..be3ae10cea 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/culture-and-hostnames.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/culture-and-hostnames.repository.ts @@ -3,7 +3,7 @@ import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; import { UMB_NOTIFICATION_CONTEXT } from '@umbraco-cms/backoffice/notification'; import type { UmbApi } from '@umbraco-cms/backoffice/extension-api'; -import type { DomainsPresentationModelBaseModel } from '@umbraco-cms/backoffice/backend-api'; +import type { DomainsPresentationModelBaseModel } from '@umbraco-cms/backoffice/external/backend-api'; export class UmbDocumentCultureAndHostnamesRepository extends UmbBaseController implements UmbApi { #dataSource = new UmbDocumentCultureAndHostnamesServerDataSource(this); diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/culture-and-hostnames.server.data.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/culture-and-hostnames.server.data.ts index c3cd1dabe2..fe4123f967 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/culture-and-hostnames.server.data.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/culture-and-hostnames.server.data.ts @@ -1,5 +1,5 @@ -import { DocumentResource } from '@umbraco-cms/backoffice/backend-api'; -import type { DomainsPresentationModelBaseModel } from '@umbraco-cms/backoffice/backend-api'; +import { DocumentResource } from '@umbraco-cms/backoffice/external/backend-api'; +import type { DomainsPresentationModelBaseModel } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/permissions/permissions-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/permissions/permissions-modal.element.ts index d1b23e06a9..fb480097c9 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/permissions/permissions-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/permissions/permissions-modal.element.ts @@ -10,7 +10,7 @@ import type { UmbModalManagerContext, } from '@umbraco-cms/backoffice/modal'; import { UMB_ENTITY_USER_PERMISSION_MODAL, UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { UmbSelectedEvent } from '@umbraco-cms/backoffice/event'; type UmbUserGroupRefData = { diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/public-access/modal/public-access-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/public-access/modal/public-access-modal.element.ts index aaebdcdc38..caa6a15925 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/public-access/modal/public-access-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/public-access/modal/public-access-modal.element.ts @@ -9,7 +9,7 @@ import { type UmbPublicAccessModalValue, } from '@umbraco-cms/backoffice/document'; import type { UUIRadioEvent } from '@umbraco-cms/backoffice/external/uui'; -import type { PublicAccessRequestModel } from '@umbraco-cms/backoffice/backend-api'; +import type { PublicAccessRequestModel } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbInputMemberTypeElement } from '@umbraco-cms/backoffice/member-type'; import type { UmbInputMemberElement } from '@umbraco-cms/backoffice/member'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/public-access/repository/public-access.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/public-access/repository/public-access.repository.ts index 7f19626210..556aa465e3 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/public-access/repository/public-access.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/public-access/repository/public-access.repository.ts @@ -4,7 +4,7 @@ import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; import type { UmbNotificationContext } from '@umbraco-cms/backoffice/notification'; import { UMB_NOTIFICATION_CONTEXT } from '@umbraco-cms/backoffice/notification'; import type { UmbApi } from '@umbraco-cms/backoffice/extension-api'; -import type { PublicAccessRequestModel } from '@umbraco-cms/backoffice/backend-api'; +import type { PublicAccessRequestModel } from '@umbraco-cms/backoffice/external/backend-api'; export class UmbDocumentPublicAccessRepository extends UmbBaseController implements UmbApi { #dataSource: UmbDocumentPublicAccessServerDataSource; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/public-access/repository/public-access.server.data.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/public-access/repository/public-access.server.data.ts index c139e7cbd8..41e9453d94 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/public-access/repository/public-access.server.data.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/public-access/repository/public-access.server.data.ts @@ -1,5 +1,5 @@ -import { DocumentResource } from '@umbraco-cms/backoffice/backend-api'; -import type { PublicAccessRequestModel } from '@umbraco-cms/backoffice/backend-api'; +import { DocumentResource } from '@umbraco-cms/backoffice/external/backend-api'; +import type { PublicAccessRequestModel } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/property-editors/document-picker/property-editor-ui-document-picker.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/property-editors/document-picker/property-editor-ui-document-picker.element.ts index 957cd94e11..9f7d2a0574 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/property-editors/document-picker/property-editor-ui-document-picker.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/property-editors/document-picker/property-editor-ui-document-picker.element.ts @@ -1,7 +1,7 @@ import type { UmbInputDocumentElement } from '../../components/input-document/input-document.element.js'; import { html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit'; import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor'; @customElement('umb-property-editor-ui-document-picker') diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/recycle-bin/tree/document-recycle-bin-tree.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/recycle-bin/tree/document-recycle-bin-tree.server.data-source.ts index c83692924c..1758264f02 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/recycle-bin/tree/document-recycle-bin-tree.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/recycle-bin/tree/document-recycle-bin-tree.server.data-source.ts @@ -1,6 +1,6 @@ import type { UmbDocumentRecycleBinTreeItemModel } from './types.js'; -import type { DocumentRecycleBinItemResponseModel } from '@umbraco-cms/backoffice/backend-api'; -import { DocumentResource } from '@umbraco-cms/backoffice/backend-api'; +import type { DocumentRecycleBinItemResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { DocumentResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { UmbTreeServerDataSourceBase } from '@umbraco-cms/backoffice/tree'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/detail/document-detail.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/detail/document-detail.server.data-source.ts index 1faaddad12..c1d0e23062 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/detail/document-detail.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/detail/document-detail.server.data-source.ts @@ -2,8 +2,11 @@ import type { UmbDocumentDetailModel } from '../../types.js'; import { UMB_DOCUMENT_ENTITY_TYPE } from '../../entity.js'; import { UmbId } from '@umbraco-cms/backoffice/id'; import type { UmbDetailDataSource } from '@umbraco-cms/backoffice/repository'; -import type { CreateDocumentRequestModel, UpdateDocumentRequestModel } from '@umbraco-cms/backoffice/backend-api'; -import { DocumentResource } from '@umbraco-cms/backoffice/backend-api'; +import type { + CreateDocumentRequestModel, + UpdateDocumentRequestModel, +} from '@umbraco-cms/backoffice/external/backend-api'; +import { DocumentResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/item/document-item.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/item/document-item.server.data-source.ts index 68f406d145..293ab5935d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/item/document-item.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/item/document-item.server.data-source.ts @@ -1,6 +1,6 @@ import type { UmbDocumentItemModel } from './types.js'; -import type { DocumentItemResponseModel } from '@umbraco-cms/backoffice/backend-api'; -import { DocumentResource } from '@umbraco-cms/backoffice/backend-api'; +import type { DocumentItemResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { DocumentResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { UmbItemServerDataSourceBase } from '@umbraco-cms/backoffice/repository'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/item/types.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/item/types.ts index b6de96a90b..9da5379a3c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/item/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/item/types.ts @@ -1,4 +1,4 @@ -import type { DocumentVariantStateModel } from '@umbraco-cms/backoffice/backend-api'; +import type { DocumentVariantStateModel } from '@umbraco-cms/backoffice/external/backend-api'; export interface UmbDocumentItemModel { name: string; // TODO: this is not correct. We need to get it from the variants. This is a temp solution. diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/publishing/document-publishing.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/publishing/document-publishing.server.data-source.ts index b22ddba2e6..d04414c784 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/publishing/document-publishing.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/publishing/document-publishing.server.data-source.ts @@ -1,5 +1,8 @@ -import type { PublishDocumentRequestModel, UnpublishDocumentRequestModel } from '@umbraco-cms/backoffice/backend-api'; -import { DocumentResource } from '@umbraco-cms/backoffice/backend-api'; +import type { + PublishDocumentRequestModel, + UnpublishDocumentRequestModel, +} from '@umbraco-cms/backoffice/external/backend-api'; +import { DocumentResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; import type { UmbVariantId } from '@umbraco-cms/backoffice/variant'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/tracked-reference/repository/document-tracked-reference.server.data.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/tracked-reference/repository/document-tracked-reference.server.data.ts index a55e662822..818973aa0b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/tracked-reference/repository/document-tracked-reference.server.data.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/tracked-reference/repository/document-tracked-reference.server.data.ts @@ -1,4 +1,4 @@ -import { TrackedReferenceResource } from '@umbraco-cms/backoffice/backend-api'; +import { TrackedReferenceResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/tree/document-tree.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/tree/document-tree.server.data-source.ts index 62fd42aa30..7425f3a3eb 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/tree/document-tree.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/tree/document-tree.server.data-source.ts @@ -1,8 +1,8 @@ import { UMB_DOCUMENT_ENTITY_TYPE } from '../entity.js'; import type { UmbDocumentTreeItemModel } from './types.js'; import { UmbTreeServerDataSourceBase } from '@umbraco-cms/backoffice/tree'; -import type { DocumentTreeItemResponseModel } from '@umbraco-cms/backoffice/backend-api'; -import { DocumentResource } from '@umbraco-cms/backoffice/backend-api'; +import type { DocumentTreeItemResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { DocumentResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; /** diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/tree/tree-item/document-tree-item.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/tree/tree-item/document-tree-item.element.ts index 526a8c75a5..d733c7fccf 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/tree/tree-item/document-tree-item.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/tree/tree-item/document-tree-item.element.ts @@ -2,7 +2,7 @@ import type { UmbDocumentTreeItemModel } from '../types.js'; import { UmbDocumentTreeItemContext } from './document-tree-item.context.js'; import { css, html, nothing, customElement, property } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbTreeItemElement } from '@umbraco-cms/backoffice/extension-registry'; @customElement('umb-document-tree-item') diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/tree/types.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/tree/types.ts index b43652dc1f..a90f9f8b7e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/tree/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/tree/types.ts @@ -1,6 +1,6 @@ import type { UmbDocumentEntityType, UmbDocumentRootEntityType } from '../entity.js'; import type { UmbUniqueTreeItemModel, UmbUniqueTreeRootModel } from '@umbraco-cms/backoffice/tree'; -import type { DocumentVariantStateModel } from '@umbraco-cms/backoffice/backend-api'; +import type { DocumentVariantStateModel } from '@umbraco-cms/backoffice/external/backend-api'; export interface UmbDocumentTreeItemModel extends UmbUniqueTreeItemModel { entityType: UmbDocumentEntityType; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/types.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/types.ts index 780897232b..9de2c69853 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/types.ts @@ -1,6 +1,6 @@ import type { UmbDocumentEntityType } from './entity.js'; import type { UmbVariantModel } from '@umbraco-cms/backoffice/variant'; -import type { DocumentVariantStateModel } from '@umbraco-cms/backoffice/backend-api'; +import type { DocumentVariantStateModel } from '@umbraco-cms/backoffice/external/backend-api'; export interface UmbDocumentDetailModel { documentType: { unique: string }; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace-editor.element.ts index 6dcf38a5e4..dd8f13d583 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace-editor.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace-editor.element.ts @@ -6,7 +6,7 @@ import type { UmbVariantModel } from '@umbraco-cms/backoffice/variant'; import { UmbVariantId } from '@umbraco-cms/backoffice/variant'; import type { UmbRoute, UmbRouterSlotInitEvent } from '@umbraco-cms/backoffice/router'; import type { ActiveVariant } from '@umbraco-cms/backoffice/workspace'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-document-workspace-editor') export class UmbDocumentWorkspaceEditorElement extends UmbLitElement { //private _defaultVariant?: VariantViewModelBaseModel; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace-split-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace-split-view.element.ts index 40d66a61bd..a0eb343912 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace-split-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace-split-view.element.ts @@ -2,7 +2,7 @@ import { UMB_DOCUMENT_WORKSPACE_CONTEXT } from './document-workspace.context-tok import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { css, html, nothing, customElement, state, repeat } from '@umbraco-cms/backoffice/external/lit'; import type { ActiveVariant } from '@umbraco-cms/backoffice/workspace'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-document-workspace-split-view') export class UmbDocumentWorkspaceSplitViewElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace.context.ts index 4bc86ab5a0..66ad5352bf 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace.context.ts @@ -121,6 +121,10 @@ export class UmbDocumentWorkspaceContext this.#currentData.update({ variants }); } + setTemplate(templateUnique: string) { + this.#currentData.update({ template: { unique: templateUnique } }); + } + async propertyStructureById(propertyId: string) { return this.structure.propertyStructureById(propertyId); } diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace.element.ts index 260d770807..e26cdec697 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace.element.ts @@ -3,7 +3,7 @@ import { UmbDocumentWorkspaceEditorElement } from './document-workspace-editor.e import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; import type { UmbRoute } from '@umbraco-cms/backoffice/router'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { UmbWorkspaceIsNewRedirectController } from '@umbraco-cms/backoffice/workspace'; import type { UmbApi } from '@umbraco-cms/backoffice/extension-api'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/manifests.ts index 0bab8a6794..2f1b7b894a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/manifests.ts @@ -7,7 +7,6 @@ import type { ManifestWorkspace, ManifestWorkspaceAction, ManifestWorkspaceView, - ManifestWorkspaceViewCollection, } from '@umbraco-cms/backoffice/extension-registry'; const workspace: ManifestWorkspace = { @@ -60,25 +59,6 @@ const workspaceViews: Array = [ }, ]; -const workspaceViewCollections: Array = [ - /* - // TODO: Reenable this: - { - type: 'workspaceViewCollection', - alias: 'Umb.WorkspaceView.Document.Collection', - name: 'Document Workspace Collection View', - weight: 300, - meta: { - label: 'Documents', - pathname: 'collection', - icon: 'icon-grid', - entityType: UMB_DOCUMENT_ENTITY_TYPE, - repositoryAlias: DOCUMENT_REPOSITORY_ALIAS, - } - }, - */ -]; - const workspaceActions: Array = [ { type: 'workspaceAction', @@ -152,4 +132,4 @@ const workspaceActions: Array = [ */ ]; -export const manifests = [workspace, ...workspaceViews, ...workspaceViewCollections, ...workspaceActions]; +export const manifests = [workspace, ...workspaceViews, ...workspaceActions]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/edit/document-workspace-view-edit-properties.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/edit/document-workspace-view-edit-properties.element.ts index 5862165faf..39e9bd1f54 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/edit/document-workspace-view-edit-properties.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/edit/document-workspace-view-edit-properties.element.ts @@ -3,7 +3,7 @@ import { css, html, customElement, property, state, repeat } from '@umbraco-cms/ import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import type { UmbPropertyContainerTypes, UmbPropertyTypeModel } from '@umbraco-cms/backoffice/content-type'; import { UmbContentTypePropertyStructureHelper } from '@umbraco-cms/backoffice/content-type'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-document-workspace-view-edit-properties') export class UmbDocumentWorkspaceViewEditPropertiesElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/edit/document-workspace-view-edit-tab.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/edit/document-workspace-view-edit-tab.element.ts index 51adb30ce2..796f9274ef 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/edit/document-workspace-view-edit-tab.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/edit/document-workspace-view-edit-tab.element.ts @@ -2,8 +2,8 @@ import { UMB_DOCUMENT_WORKSPACE_CONTEXT } from '../../document-workspace.context import { css, html, customElement, property, state, repeat } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { UmbContentTypeContainerStructureHelper } from '@umbraco-cms/backoffice/content-type'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; -import type { PropertyTypeContainerModelBaseModel } from '@umbraco-cms/backoffice/backend-api'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; +import type { PropertyTypeContainerModelBaseModel } from '@umbraco-cms/backoffice/external/backend-api'; import './document-workspace-view-edit-properties.element.js'; @customElement('umb-document-workspace-view-edit-tab') diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/edit/document-workspace-view-edit.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/edit/document-workspace-view-edit.element.ts index 68a60a2bc6..65b544bc01 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/edit/document-workspace-view-edit.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/edit/document-workspace-view-edit.element.ts @@ -5,8 +5,8 @@ import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { UmbContentTypeContainerStructureHelper } from '@umbraco-cms/backoffice/content-type'; import type { UmbRoute, UmbRouterSlotChangeEvent, UmbRouterSlotInitEvent } from '@umbraco-cms/backoffice/router'; import { encodeFolderName } from '@umbraco-cms/backoffice/router'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; -import type { PropertyTypeContainerModelBaseModel } from '@umbraco-cms/backoffice/backend-api'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; +import type { PropertyTypeContainerModelBaseModel } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbWorkspaceViewElement } from '@umbraco-cms/backoffice/extension-registry'; @customElement('umb-document-workspace-view-edit') diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/info/document-workspace-view-info-history.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/info/document-workspace-view-info-history.element.ts index 55b06ab99f..25feac848d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/info/document-workspace-view-info-history.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/info/document-workspace-view-info-history.element.ts @@ -11,10 +11,10 @@ import { ifDefined, } from '@umbraco-cms/backoffice/external/lit'; import type { UUIPaginationEvent } from '@umbraco-cms/backoffice/external/uui'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; -import type { AuditLogWithUsernameResponseModel } from '@umbraco-cms/backoffice/backend-api'; -import { DirectionModel } from '@umbraco-cms/backoffice/backend-api'; +import type { AuditLogWithUsernameResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { DirectionModel } from '@umbraco-cms/backoffice/external/backend-api'; @customElement('umb-document-workspace-view-info-history') export class UmbDocumentWorkspaceViewInfoHistoryElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/info/document-workspace-view-info-reference.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/info/document-workspace-view-info-reference.element.ts index 5c4e5df571..fda96f7f92 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/info/document-workspace-view-info-reference.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/info/document-workspace-view-info-reference.element.ts @@ -1,8 +1,8 @@ import { css, html, customElement, state, nothing, repeat, property } from '@umbraco-cms/backoffice/external/lit'; import type { UUIPaginationEvent } from '@umbraco-cms/backoffice/external/uui'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; -import type { RelationItemResponseModel } from '@umbraco-cms/backoffice/backend-api'; +import type { RelationItemResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; import { UmbDocumentTrackedReferenceRepository } from '@umbraco-cms/backoffice/document'; import { UMB_WORKSPACE_MODAL, UmbModalRouteRegistrationController } from '@umbraco-cms/backoffice/modal'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/info/document-workspace-view-info.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/info/document-workspace-view-info.element.ts index 749bab5913..fe6b40a1c2 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/info/document-workspace-view-info.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/info/document-workspace-view-info.element.ts @@ -1,13 +1,18 @@ import { TimeOptions } from './utils.js'; import { css, html, customElement, state, repeat } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { UMB_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/workspace'; -import { UMB_WORKSPACE_MODAL, UmbModalRouteRegistrationController } from '@umbraco-cms/backoffice/modal'; +import { + UMB_MODAL_MANAGER_CONTEXT, + UMB_TEMPLATE_PICKER_MODAL, + UMB_WORKSPACE_MODAL, + UmbModalRouteRegistrationController, +} from '@umbraco-cms/backoffice/modal'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import './document-workspace-view-info-history.element.js'; import './document-workspace-view-info-reference.element.js'; import type { UmbDocumentWorkspaceContext } from '@umbraco-cms/backoffice/document'; -import type { DocumentUrlInfoModel } from '@umbraco-cms/backoffice/backend-api'; +import type { DocumentUrlInfoModel } from '@umbraco-cms/backoffice/external/backend-api'; @customElement('umb-document-workspace-view-info') export class UmbDocumentWorkspaceViewInfoElement extends UmbLitElement { @@ -20,7 +25,10 @@ export class UmbDocumentWorkspaceViewInfoElement extends UmbLitElement { @state() private _documentUnique = ''; - private _workspaceContext?: typeof UMB_WORKSPACE_CONTEXT.TYPE; + @state() + private _templateUnique = ''; + + private _workspaceContext?: UmbDocumentWorkspaceContext; @state() private _editDocumentTypePath = ''; @@ -31,6 +39,8 @@ export class UmbDocumentWorkspaceViewInfoElement extends UmbLitElement { @state() private _createDate = 'Unknown'; + #modalManagerContext?: typeof UMB_MODAL_MANAGER_CONTEXT.TYPE; + constructor() { super(); @@ -44,9 +54,13 @@ export class UmbDocumentWorkspaceViewInfoElement extends UmbLitElement { }); this.consumeContext(UMB_WORKSPACE_CONTEXT, (nodeContext) => { - this._workspaceContext = nodeContext; + this._workspaceContext = nodeContext as UmbDocumentWorkspaceContext; this._observeContent(); }); + + this.consumeContext(UMB_MODAL_MANAGER_CONTEXT, (modalManagerContext) => { + this.#modalManagerContext = modalManagerContext; + }); } private _observeContent() { @@ -54,18 +68,30 @@ export class UmbDocumentWorkspaceViewInfoElement extends UmbLitElement { this._nodeName = 'TBD, with variants this is not as simple.'; - this._documentTypeId = (this._workspaceContext as UmbDocumentWorkspaceContext).getContentTypeId()!; + this._documentTypeId = this._workspaceContext.getContentTypeId()!; - this.observe((this._workspaceContext as UmbDocumentWorkspaceContext).urls, (urls) => { + this.observe(this._workspaceContext.urls, (urls) => { this._urls = urls; }); - this.observe((this._workspaceContext as UmbDocumentWorkspaceContext).unique, (unique) => { - this._documentUnique = unique!; - }); + this.observe( + this._workspaceContext.unique, + (unique) => { + this._documentUnique = unique!; + }, + '_documentUnique', + ); + + this.observe( + this._workspaceContext.templateId, + (templateUnique) => { + this._templateUnique = templateUnique!; + }, + '_templateUnique', + ); /** TODO: Doubt this is the right way to get the create date... */ - this.observe((this._workspaceContext as UmbDocumentWorkspaceContext).variants, (variants) => { + this.observe(this._workspaceContext.variants, (variants) => { this._createDate = Array.isArray(variants) ? variants[0].createDate || 'Unknown' : 'Unknown'; }); } @@ -136,7 +162,10 @@ export class UmbDocumentWorkspaceViewInfoElement extends UmbLitElement {
- +
@@ -145,6 +174,28 @@ export class UmbDocumentWorkspaceViewInfoElement extends UmbLitElement { `; } + async #openTemplatePicker() { + const modal = this.#modalManagerContext?.open(UMB_TEMPLATE_PICKER_MODAL, { + data: { + hideTreeRoot: true, + multiple: false, + }, + value: { + selection: [this._templateUnique], + }, + }); + + const result = await modal?.onSubmit().catch(() => undefined); + + if (!result?.selection.length) return; + + const templateUnique = result.selection[0]; + + if (!templateUnique) return; + + this._workspaceContext?.setTemplate(templateUnique); + } + static styles = [ UmbTextStyles, css` diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/info/utils.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/info/utils.ts index 2a3bb65c39..3471249ab9 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/info/utils.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/info/utils.ts @@ -1,4 +1,4 @@ -import { AuditTypeModel } from '@umbraco-cms/backoffice/backend-api'; +import { AuditTypeModel } from '@umbraco-cms/backoffice/external/backend-api'; interface HistoryStyleMap { look: 'default' | 'primary' | 'secondary' | 'outline' | 'placeholder'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/dynamic-root/repository/dynamic-root.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/dynamic-root/repository/dynamic-root.repository.ts index d30cf8021d..323b9b7f5c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/dynamic-root/repository/dynamic-root.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/dynamic-root/repository/dynamic-root.repository.ts @@ -1,7 +1,7 @@ import { UmbDynamicRootServerDataSource } from './dynamic-root.server.data.js'; import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api'; -import type { DynamicRootRequestModel } from '@umbraco-cms/backoffice/backend-api'; +import type { DynamicRootRequestModel } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbTreePickerDynamicRoot } from '@umbraco-cms/backoffice/components'; const GUID_EMPTY: string = '00000000-0000-0000-0000-000000000000'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/dynamic-root/repository/dynamic-root.server.data.ts b/src/Umbraco.Web.UI.Client/src/packages/dynamic-root/repository/dynamic-root.server.data.ts index f5bc47fc30..9553724bdc 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/dynamic-root/repository/dynamic-root.server.data.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/dynamic-root/repository/dynamic-root.server.data.ts @@ -1,6 +1,6 @@ -import { DynamicRootResource } from '@umbraco-cms/backoffice/backend-api'; +import { DynamicRootResource } from '@umbraco-cms/backoffice/external/backend-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; -import type { DynamicRootRequestModel, DynamicRootResponseModel } from '@umbraco-cms/backoffice/backend-api'; +import type { DynamicRootRequestModel, DynamicRootResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; export class UmbDynamicRootServerDataSource { diff --git a/src/Umbraco.Web.UI.Client/src/packages/health-check/dashboard-health-check.element.ts b/src/Umbraco.Web.UI.Client/src/packages/health-check/dashboard-health-check.element.ts index 183ff898d5..f56b60de79 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/health-check/dashboard-health-check.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/health-check/dashboard-health-check.element.ts @@ -2,10 +2,10 @@ import type { UmbDashboardHealthCheckGroupElement } from './views/health-check-g import { UmbHealthCheckDashboardContext, UMB_HEALTHCHECK_DASHBOARD_CONTEXT } from './health-check-dashboard.context.js'; import { UmbHealthCheckContext } from './health-check.context.js'; import { html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; -import type { HealthCheckGroupResponseModel } from '@umbraco-cms/backoffice/backend-api'; -import { HealthCheckResource } from '@umbraco-cms/backoffice/backend-api'; +import type { HealthCheckGroupResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { HealthCheckResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbRoute } from '@umbraco-cms/backoffice/router'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { ManifestHealthCheck } from '@umbraco-cms/backoffice/extension-registry'; import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/health-check/health-check.context.ts b/src/Umbraco.Web.UI.Client/src/packages/health-check/health-check.context.ts index ff5ea849ab..b96e96d610 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/health-check/health-check.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/health-check/health-check.context.ts @@ -1,10 +1,9 @@ import { BehaviorSubject } from '@umbraco-cms/backoffice/external/rxjs'; import type { HealthCheckGroupPresentationModel, - HealthCheckGroupWithResultResponseModel} from '@umbraco-cms/backoffice/backend-api'; -import { - HealthCheckResource, -} from '@umbraco-cms/backoffice/backend-api'; + HealthCheckGroupWithResultResponseModel, +} from '@umbraco-cms/backoffice/external/backend-api'; +import { HealthCheckResource } from '@umbraco-cms/backoffice/external/backend-api'; import { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/health-check/views/health-check-action.element.ts b/src/Umbraco.Web.UI.Client/src/packages/health-check/views/health-check-action.element.ts index 4fe04ad1d3..f964d1d736 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/health-check/views/health-check-action.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/health-check/views/health-check-action.element.ts @@ -2,9 +2,9 @@ import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import type { UUIButtonState } from '@umbraco-cms/backoffice/external/uui'; import { css, html, nothing, customElement, property, state, ifDefined } from '@umbraco-cms/backoffice/external/lit'; -import type { HealthCheckActionRequestModel} from '@umbraco-cms/backoffice/backend-api'; -import { HealthCheckResource } from '@umbraco-cms/backoffice/backend-api'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import type { HealthCheckActionRequestModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { HealthCheckResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; @customElement('umb-dashboard-health-check-action') diff --git a/src/Umbraco.Web.UI.Client/src/packages/health-check/views/health-check-group-box-overview.element.ts b/src/Umbraco.Web.UI.Client/src/packages/health-check/views/health-check-group-box-overview.element.ts index 0231fd515f..d2dcb2d70f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/health-check/views/health-check-group-box-overview.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/health-check/views/health-check-group-box-overview.element.ts @@ -1,16 +1,13 @@ import type { UmbHealthCheckContext } from '../health-check.context.js'; -import type { - UmbHealthCheckDashboardContext} from '../health-check-dashboard.context.js'; -import { - UMB_HEALTHCHECK_DASHBOARD_CONTEXT -} from '../health-check-dashboard.context.js'; +import type { UmbHealthCheckDashboardContext } from '../health-check-dashboard.context.js'; +import { UMB_HEALTHCHECK_DASHBOARD_CONTEXT } from '../health-check-dashboard.context.js'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { css, html, nothing, customElement, property, state } from '@umbraco-cms/backoffice/external/lit'; import { ensureSlash, path } from '@umbraco-cms/backoffice/router'; import type { ManifestHealthCheck } from '@umbraco-cms/backoffice/extension-registry'; -import type { HealthCheckGroupWithResultResponseModel} from '@umbraco-cms/backoffice/backend-api'; -import { StatusResultTypeModel } from '@umbraco-cms/backoffice/backend-api'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import type { HealthCheckGroupWithResultResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { StatusResultTypeModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-health-check-group-box-overview') export class UmbHealthCheckGroupBoxOverviewElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/health-check/views/health-check-group.element.ts b/src/Umbraco.Web.UI.Client/src/packages/health-check/views/health-check-group.element.ts index 3e6007e11c..fd2a2b8453 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/health-check/views/health-check-group.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/health-check/views/health-check-group.element.ts @@ -1,9 +1,6 @@ import type { UmbHealthCheckContext } from '../health-check.context.js'; -import type { - UmbHealthCheckDashboardContext} from '../health-check-dashboard.context.js'; -import { - UMB_HEALTHCHECK_DASHBOARD_CONTEXT, -} from '../health-check-dashboard.context.js'; +import type { UmbHealthCheckDashboardContext } from '../health-check-dashboard.context.js'; +import { UMB_HEALTHCHECK_DASHBOARD_CONTEXT } from '../health-check-dashboard.context.js'; import type { UUIButtonState } from '@umbraco-cms/backoffice/external/uui'; import { css, html, nothing, customElement, property, state, unsafeHTML } from '@umbraco-cms/backoffice/external/lit'; @@ -11,12 +8,10 @@ import type { HealthCheckActionRequestModel, HealthCheckGroupPresentationModel, HealthCheckModel, - HealthCheckWithResultPresentationModel} from '@umbraco-cms/backoffice/backend-api'; -import { - HealthCheckResource, - StatusResultTypeModel, -} from '@umbraco-cms/backoffice/backend-api'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; + HealthCheckWithResultPresentationModel, +} from '@umbraco-cms/backoffice/external/backend-api'; +import { HealthCheckResource, StatusResultTypeModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; import './health-check-action.element.js'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/health-check/views/health-check-overview.element.ts b/src/Umbraco.Web.UI.Client/src/packages/health-check/views/health-check-overview.element.ts index 6962b144f8..d05a3f7022 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/health-check/views/health-check-overview.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/health-check/views/health-check-overview.element.ts @@ -1,12 +1,9 @@ -import type { - UmbHealthCheckDashboardContext} from '../health-check-dashboard.context.js'; -import { - UMB_HEALTHCHECK_DASHBOARD_CONTEXT, -} from '../health-check-dashboard.context.js'; +import type { UmbHealthCheckDashboardContext } from '../health-check-dashboard.context.js'; +import { UMB_HEALTHCHECK_DASHBOARD_CONTEXT } from '../health-check-dashboard.context.js'; import type { UUIButtonState } from '@umbraco-cms/backoffice/external/uui'; import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import './health-check-group-box-overview.element.js'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/language/app-language-select/app-language-select.element.ts b/src/Umbraco.Web.UI.Client/src/packages/language/app-language-select/app-language-select.element.ts index f2754dd67b..cf9bff4cf2 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/language/app-language-select/app-language-select.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/language/app-language-select/app-language-select.element.ts @@ -4,7 +4,7 @@ import type { UmbAppLanguageContext } from './app-language.context.js'; import { UMB_APP_LANGUAGE_CONTEXT } from './app-language.context.js'; import type { UUIMenuItemEvent, UUIPopoverContainerElement } from '@umbraco-cms/backoffice/external/uui'; import { css, html, customElement, state, repeat, ifDefined, query } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-app-language-select') export class UmbAppLanguageSelectElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/language/collection/repository/language-collection.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/language/collection/repository/language-collection.server.data-source.ts index c7501b8b24..887d15c607 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/language/collection/repository/language-collection.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/language/collection/repository/language-collection.server.data-source.ts @@ -2,7 +2,7 @@ import type { UmbLanguageCollectionFilterModel } from '../types.js'; import type { UmbLanguageDetailModel } from '../../types.js'; import { UMB_LANGUAGE_ENTITY_TYPE } from '../../entity.js'; import type { UmbCollectionDataSource } from '@umbraco-cms/backoffice/repository'; -import { LanguageResource } from '@umbraco-cms/backoffice/backend-api'; +import { LanguageResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/language/collection/views/table/column-layouts/boolean/language-table-boolean-column-layout.element.ts b/src/Umbraco.Web.UI.Client/src/packages/language/collection/views/table/column-layouts/boolean/language-table-boolean-column-layout.element.ts index 0f5c1f33aa..2cd3889768 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/language/collection/views/table/column-layouts/boolean/language-table-boolean-column-layout.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/language/collection/views/table/column-layouts/boolean/language-table-boolean-column-layout.element.ts @@ -1,6 +1,6 @@ import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { html, nothing, customElement, property } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-language-table-boolean-column-layout') export class UmbLanguageTableBooleanColumnLayoutElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/language/collection/views/table/column-layouts/entity-actions/language-table-entity-actions-column-layout.element.ts b/src/Umbraco.Web.UI.Client/src/packages/language/collection/views/table/column-layouts/entity-actions/language-table-entity-actions-column-layout.element.ts index aa3b3461bd..a0ba5f31d8 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/language/collection/views/table/column-layouts/entity-actions/language-table-entity-actions-column-layout.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/language/collection/views/table/column-layouts/entity-actions/language-table-entity-actions-column-layout.element.ts @@ -1,7 +1,7 @@ import type { UmbLanguageDetailModel } from '../../../../../types.js'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { html, nothing, customElement, property, state, ifDefined } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-language-table-entity-actions-column-layout') export class UmbLanguageTableEntityActionsColumnLayoutElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/language/collection/views/table/language-table-collection-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/language/collection/views/table/language-table-collection-view.element.ts index 7450b301b8..3e3359dc27 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/language/collection/views/table/language-table-collection-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/language/collection/views/table/language-table-collection-view.element.ts @@ -4,7 +4,7 @@ import { UMB_DEFAULT_COLLECTION_CONTEXT } from '@umbraco-cms/backoffice/collecti import type { UmbTableColumn, UmbTableConfig, UmbTableItem } from '@umbraco-cms/backoffice/components'; import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import './column-layouts/boolean/language-table-boolean-column-layout.element.js'; import './column-layouts/name/language-table-name-column-layout.element.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/language/components/input-language/input-language.element.ts b/src/Umbraco.Web.UI.Client/src/packages/language/components/input-language/input-language.element.ts index 4f2ed306d0..5ad38f95ad 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/language/components/input-language/input-language.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/language/components/input-language/input-language.element.ts @@ -2,7 +2,7 @@ import type { UmbLanguageItemModel } from '../../repository/index.js'; import { UmbLanguagePickerContext } from './input-language.context.js'; import { css, html, ifDefined, customElement, property, state } from '@umbraco-cms/backoffice/external/lit'; import { FormControlMixin } from '@umbraco-cms/backoffice/external/uui'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { splitStringToArray } from '@umbraco-cms/backoffice/utils'; @customElement('umb-input-language') diff --git a/src/Umbraco.Web.UI.Client/src/packages/language/repository/detail/language-detail.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/language/repository/detail/language-detail.server.data-source.ts index 2a8e289a40..4bcbf6ead2 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/language/repository/detail/language-detail.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/language/repository/detail/language-detail.server.data-source.ts @@ -2,8 +2,8 @@ import type { UmbLanguageDetailModel } from '../../types.js'; import { UMB_LANGUAGE_ENTITY_TYPE } from '../../entity.js'; import { UmbId } from '@umbraco-cms/backoffice/id'; import type { UmbDetailDataSource } from '@umbraco-cms/backoffice/repository'; -import type { CreateLanguageRequestModel, LanguageModelBaseModel } from '@umbraco-cms/backoffice/backend-api'; -import { LanguageResource } from '@umbraco-cms/backoffice/backend-api'; +import type { CreateLanguageRequestModel, LanguageModelBaseModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { LanguageResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/language/repository/item/language-item.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/language/repository/item/language-item.server.data-source.ts index 04cdf55f48..e1e914d809 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/language/repository/item/language-item.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/language/repository/item/language-item.server.data-source.ts @@ -1,7 +1,7 @@ import type { UmbLanguageItemModel } from './types.js'; import { UmbItemServerDataSourceBase } from '@umbraco-cms/backoffice/repository'; -import type { LanguageItemResponseModel } from '@umbraco-cms/backoffice/backend-api'; -import { LanguageResource } from '@umbraco-cms/backoffice/backend-api'; +import type { LanguageItemResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { LanguageResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; /** diff --git a/src/Umbraco.Web.UI.Client/src/packages/language/workspace/language-root/language-root-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/packages/language/workspace/language-root/language-root-workspace.element.ts index 11827267cc..fd514524df 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/language/workspace/language-root/language-root-workspace.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/language/workspace/language-root/language-root-workspace.element.ts @@ -1,6 +1,6 @@ import { UMB_LANGUAGE_COLLECTION_ALIAS } from '../../collection/index.js'; import { html, customElement } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-language-root-workspace') export class UmbLanguageRootWorkspaceElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/language/workspace/language/language-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/language/workspace/language/language-workspace-editor.element.ts index 2146f61185..122fca7de5 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/language/workspace/language/language-workspace-editor.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/language/workspace/language/language-workspace-editor.element.ts @@ -3,7 +3,7 @@ import { UMB_LANGUAGE_WORKSPACE_CONTEXT } from './language-workspace.context.js' import type { UUIInputElement } from '@umbraco-cms/backoffice/external/uui'; import { UUIInputEvent } from '@umbraco-cms/backoffice/external/uui'; import { css, html, customElement, state, ifDefined } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; @customElement('umb-language-workspace-editor') export class UmbLanguageWorkspaceEditorElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/language/workspace/language/language-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/language/workspace/language/language-workspace.context.ts index 8e6933482b..f95cb15567 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/language/workspace/language/language-workspace.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/language/workspace/language/language-workspace.context.ts @@ -4,7 +4,7 @@ import { type UmbSaveableWorkspaceContextInterface, UmbEditableWorkspaceContextBase, } from '@umbraco-cms/backoffice/workspace'; -import { ApiError } from '@umbraco-cms/backoffice/backend-api'; +import { ApiError } from '@umbraco-cms/backoffice/external/backend-api'; import { UmbObjectState } from '@umbraco-cms/backoffice/observable-api'; import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api'; import { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/language/workspace/language/language-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/packages/language/workspace/language/language-workspace.element.ts index 68e6ddce57..82bbcb19a9 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/language/workspace/language/language-workspace.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/language/workspace/language/language-workspace.element.ts @@ -3,7 +3,7 @@ import { UmbLanguageWorkspaceEditorElement } from './language-workspace-editor.e import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; import type { UmbRoute } from '@umbraco-cms/backoffice/router'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { UmbWorkspaceIsNewRedirectController } from '@umbraco-cms/backoffice/workspace'; @customElement('umb-language-workspace') diff --git a/src/Umbraco.Web.UI.Client/src/packages/language/workspace/language/views/language-details-workspace-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/language/workspace/language/views/language-details-workspace-view.element.ts index e4537c686c..783d708d03 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/language/workspace/language/views/language-details-workspace-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/language/workspace/language/views/language-details-workspace-view.element.ts @@ -7,7 +7,7 @@ import type { UUIToggleElement } from '@umbraco-cms/backoffice/external/uui'; import { UUIBooleanInputEvent } from '@umbraco-cms/backoffice/external/uui'; import { css, html, nothing, customElement, state, ifDefined } from '@umbraco-cms/backoffice/external/lit'; import { UmbChangeEvent } from '@umbraco-cms/backoffice/event'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbWorkspaceViewElement } from '@umbraco-cms/backoffice/extension-registry'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/components/log-viewer-date-range-selector.element.ts b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/components/log-viewer-date-range-selector.element.ts index d560e1c616..7f1efd219c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/components/log-viewer-date-range-selector.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/components/log-viewer-date-range-selector.element.ts @@ -1,12 +1,8 @@ -import type { - LogViewerDateRange, - UmbLogViewerWorkspaceContext} from '../workspace/logviewer.context.js'; -import { - UMB_APP_LOG_VIEWER_CONTEXT, -} from '../workspace/logviewer.context.js'; +import type { LogViewerDateRange, UmbLogViewerWorkspaceContext } from '../workspace/logviewer.context.js'; +import { UMB_APP_LOG_VIEWER_CONTEXT } from '../workspace/logviewer.context.js'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { css, html, customElement, property, queryAll, state } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { query as getQuery, path, toQueryString } from '@umbraco-cms/backoffice/router'; @customElement('umb-log-viewer-date-range-selector') diff --git a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/repository/log-viewer.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/repository/log-viewer.repository.ts index 503654227c..de4d2dee0e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/repository/log-viewer.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/repository/log-viewer.repository.ts @@ -1,9 +1,13 @@ import { UmbLogMessagesServerDataSource, UmbLogSearchesServerDataSource } from './sources/log-viewer.server.data.js'; import { UmbContextConsumerController } from '@umbraco-cms/backoffice/context-api'; import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api'; -import type { UmbNotificationContext} from '@umbraco-cms/backoffice/notification'; +import type { UmbNotificationContext } from '@umbraco-cms/backoffice/notification'; import { UMB_NOTIFICATION_CONTEXT } from '@umbraco-cms/backoffice/notification'; -import type { DirectionModel, LogLevelModel, SavedLogSearchPresenationBaseModel } from '@umbraco-cms/backoffice/backend-api'; +import type { + DirectionModel, + LogLevelModel, + SavedLogSearchPresenationBaseModel, +} from '@umbraco-cms/backoffice/external/backend-api'; // Move to documentation / JSdoc /* We need to create a new instance of the repository from within the element context. We want the notifications to be displayed in the right context. */ diff --git a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/repository/sources/index.ts b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/repository/sources/index.ts index 6c015eb773..168fff14d6 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/repository/sources/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/repository/sources/index.ts @@ -7,7 +7,7 @@ import type { PagedLogTemplateResponseModel, PagedSavedLogSearchResponseModel, SavedLogSearchResponseModel, -} from '@umbraco-cms/backoffice/backend-api'; +} from '@umbraco-cms/backoffice/external/backend-api'; import type { DataSourceResponse } from '@umbraco-cms/backoffice/repository'; export interface LogSearchDataSource { diff --git a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/repository/sources/log-viewer.server.data.ts b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/repository/sources/log-viewer.server.data.ts index 6e0abb9e50..8454adbed1 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/repository/sources/log-viewer.server.data.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/repository/sources/log-viewer.server.data.ts @@ -2,10 +2,9 @@ import type { LogMessagesDataSource, LogSearchDataSource } from './index.js'; import type { DirectionModel, LogLevelModel, - SavedLogSearchResponseModel} from '@umbraco-cms/backoffice/backend-api'; -import { - LogViewerResource -} from '@umbraco-cms/backoffice/backend-api'; + SavedLogSearchResponseModel, +} from '@umbraco-cms/backoffice/external/backend-api'; +import { LogViewerResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/logviewer.context.ts b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/logviewer.context.ts index 47b1ec9914..79f7724d1a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/logviewer.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/logviewer.context.ts @@ -6,11 +6,9 @@ import type { PagedLogMessageResponseModel, PagedLogTemplateResponseModel, PagedSavedLogSearchResponseModel, - SavedLogSearchPresenationBaseModel} from '@umbraco-cms/backoffice/backend-api'; -import { - DirectionModel, - LogLevelModel -} from '@umbraco-cms/backoffice/backend-api'; + SavedLogSearchPresenationBaseModel, +} from '@umbraco-cms/backoffice/external/backend-api'; +import { DirectionModel, LogLevelModel } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api'; import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; import { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/logviewer/logviewer-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/logviewer/logviewer-workspace.element.ts index 46f2342494..d817b96bcc 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/logviewer/logviewer-workspace.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/logviewer/logviewer-workspace.element.ts @@ -1,10 +1,10 @@ // TODO: Niels: I don't feel sure this is good, seems wrong: import '../../components/index.js'; import { UmbLogViewerWorkspaceContext } from '../logviewer.context.js'; -import type { PropertyValueMap} from '@umbraco-cms/backoffice/external/lit'; +import type { PropertyValueMap } from '@umbraco-cms/backoffice/external/lit'; import { css, html, customElement } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; //TODO make uui-input accept min and max values @customElement('umb-logviewer-workspace') diff --git a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/overview/components/log-viewer-log-level-overview.element.ts b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/overview/components/log-viewer-log-level-overview.element.ts index 7f144b0298..21c65ce697 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/overview/components/log-viewer-log-level-overview.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/overview/components/log-viewer-log-level-overview.element.ts @@ -1,8 +1,8 @@ -import type { UmbLogViewerWorkspaceContext} from '../../../logviewer.context.js'; +import type { UmbLogViewerWorkspaceContext } from '../../../logviewer.context.js'; import { UMB_APP_LOG_VIEWER_CONTEXT } from '../../../logviewer.context.js'; import { html, nothing, customElement, property, state } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; -import type { LoggerResponseModel } from '@umbraco-cms/backoffice/backend-api'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; +import type { LoggerResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; //TODO: implement the saved searches pagination when the API total bug is fixed @customElement('umb-log-viewer-log-level-overview') diff --git a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/overview/components/log-viewer-log-types-chart.element.ts b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/overview/components/log-viewer-log-types-chart.element.ts index 48734d0007..86e2f421c5 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/overview/components/log-viewer-log-types-chart.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/overview/components/log-viewer-log-types-chart.element.ts @@ -1,8 +1,8 @@ -import type { UmbLogViewerWorkspaceContext} from '../../../logviewer.context.js'; +import type { UmbLogViewerWorkspaceContext } from '../../../logviewer.context.js'; import { UMB_APP_LOG_VIEWER_CONTEXT } from '../../../logviewer.context.js'; import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; -import type { LogLevelCountsReponseModel } from '@umbraco-cms/backoffice/backend-api'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; +import type { LogLevelCountsReponseModel } from '@umbraco-cms/backoffice/external/backend-api'; @customElement('umb-log-viewer-log-types-chart') export class UmbLogViewerLogTypesChartElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/overview/components/log-viewer-message-templates-overview.element.ts b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/overview/components/log-viewer-message-templates-overview.element.ts index 143b67e796..56e67450cd 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/overview/components/log-viewer-message-templates-overview.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/overview/components/log-viewer-message-templates-overview.element.ts @@ -1,9 +1,12 @@ -import type { UmbLogViewerWorkspaceContext} from '../../../logviewer.context.js'; +import type { UmbLogViewerWorkspaceContext } from '../../../logviewer.context.js'; import { UMB_APP_LOG_VIEWER_CONTEXT } from '../../../logviewer.context.js'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; -import type { PagedLogTemplateResponseModel, SavedLogSearchResponseModel } from '@umbraco-cms/backoffice/backend-api'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; +import type { + PagedLogTemplateResponseModel, + SavedLogSearchResponseModel, +} from '@umbraco-cms/backoffice/external/backend-api'; //TODO: fix pagination bug when API is fixed @customElement('umb-log-viewer-message-templates-overview') diff --git a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/overview/components/log-viewer-saved-searches-overview.element.ts b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/overview/components/log-viewer-saved-searches-overview.element.ts index 462b873317..517a46d848 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/overview/components/log-viewer-saved-searches-overview.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/overview/components/log-viewer-saved-searches-overview.element.ts @@ -1,9 +1,9 @@ -import type { UmbLogViewerWorkspaceContext} from '../../../logviewer.context.js'; +import type { UmbLogViewerWorkspaceContext } from '../../../logviewer.context.js'; import { UMB_APP_LOG_VIEWER_CONTEXT } from '../../../logviewer.context.js'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; -import type { SavedLogSearchResponseModel } from '@umbraco-cms/backoffice/backend-api'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; +import type { SavedLogSearchResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; //TODO: implement the saved searches pagination when the API total bug is fixed @customElement('umb-log-viewer-saved-searches-overview') diff --git a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/overview/log-overview-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/overview/log-overview-view.element.ts index a1d9ede634..6f1cbd716b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/overview/log-overview-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/overview/log-overview-view.element.ts @@ -1,8 +1,8 @@ -import type { UmbLogViewerWorkspaceContext} from '../../logviewer.context.js'; +import type { UmbLogViewerWorkspaceContext } from '../../logviewer.context.js'; import { UMB_APP_LOG_VIEWER_CONTEXT } from '../../logviewer.context.js'; import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; -import type { LogLevelCountsReponseModel } from '@umbraco-cms/backoffice/backend-api'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import type { LogLevelCountsReponseModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; //TODO: add a disabled attribute to the show more button when the total number of items is correctly returned from the endpoint @customElement('umb-log-viewer-overview-view') diff --git a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/components/log-viewer-level-tag.element.ts b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/components/log-viewer-level-tag.element.ts index 2ff8e0d56d..6b9bc816b6 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/components/log-viewer-level-tag.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/components/log-viewer-level-tag.element.ts @@ -1,6 +1,6 @@ import type { UUIInterfaceColor, UUIInterfaceLook } from '@umbraco-cms/backoffice/external/uui'; import { html, LitElement, ifDefined, customElement, property } from '@umbraco-cms/backoffice/external/lit'; -import type { LogLevelModel } from '@umbraco-cms/backoffice/backend-api'; +import type { LogLevelModel } from '@umbraco-cms/backoffice/external/backend-api'; interface LevelMapStyles { look?: UUIInterfaceLook; diff --git a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/components/log-viewer-log-level-filter-menu.element.ts b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/components/log-viewer-log-level-filter-menu.element.ts index 54038b7b6e..ee1aee72a9 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/components/log-viewer-log-level-filter-menu.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/components/log-viewer-log-level-filter-menu.element.ts @@ -1,10 +1,10 @@ -import type { UmbLogViewerWorkspaceContext} from '../../../logviewer.context.js'; +import type { UmbLogViewerWorkspaceContext } from '../../../logviewer.context.js'; import { UMB_APP_LOG_VIEWER_CONTEXT } from '../../../logviewer.context.js'; import type { UUICheckboxElement } from '@umbraco-cms/backoffice/external/uui'; import { css, html, customElement, queryAll, state } from '@umbraco-cms/backoffice/external/lit'; import { debounce } from '@umbraco-cms/backoffice/external/lodash'; -import { LogLevelModel } from '@umbraco-cms/backoffice/backend-api'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { LogLevelModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { path, query, toQueryString } from '@umbraco-cms/backoffice/router'; @customElement('umb-log-viewer-log-level-filter-menu') diff --git a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/components/log-viewer-message.element.ts b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/components/log-viewer-message.element.ts index 4c62cb6933..5ec798dde2 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/components/log-viewer-message.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/components/log-viewer-message.element.ts @@ -1,18 +1,10 @@ -import type { UmbLogViewerWorkspaceContext} from '../../../logviewer.context.js'; +import type { UmbLogViewerWorkspaceContext } from '../../../logviewer.context.js'; import { UMB_APP_LOG_VIEWER_CONTEXT } from '../../../logviewer.context.js'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; -import type { - PropertyValueMap} from '@umbraco-cms/backoffice/external/lit'; -import { - css, - html, - customElement, - property, - query, - state, -} from '@umbraco-cms/backoffice/external/lit'; -import type { LogLevelModel, LogMessagePropertyPresentationModel } from '@umbraco-cms/backoffice/backend-api'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import type { PropertyValueMap } from '@umbraco-cms/backoffice/external/lit'; +import { css, html, customElement, property, query, state } from '@umbraco-cms/backoffice/external/lit'; +import type { LogLevelModel, LogMessagePropertyPresentationModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { query as getQuery, toQueryString } from '@umbraco-cms/backoffice/router'; //TODO: check how to display EventId field in the message properties diff --git a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/components/log-viewer-messages-list.element.ts b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/components/log-viewer-messages-list.element.ts index b39f4ecbdc..3a33e0b771 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/components/log-viewer-messages-list.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/components/log-viewer-messages-list.element.ts @@ -1,10 +1,10 @@ -import type { UmbLogViewerWorkspaceContext} from '../../../logviewer.context.js'; +import type { UmbLogViewerWorkspaceContext } from '../../../logviewer.context.js'; import { UMB_APP_LOG_VIEWER_CONTEXT } from '../../../logviewer.context.js'; import type { UUIScrollContainerElement, UUIPaginationElement } from '@umbraco-cms/backoffice/external/uui'; import { css, html, customElement, query, state } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; -import type { LogMessageResponseModel } from '@umbraco-cms/backoffice/backend-api'; -import { DirectionModel } from '@umbraco-cms/backoffice/backend-api'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; +import type { LogMessageResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { DirectionModel } from '@umbraco-cms/backoffice/external/backend-api'; @customElement('umb-log-viewer-messages-list') export class UmbLogViewerMessagesListElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/components/log-viewer-polling-button.element.ts b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/components/log-viewer-polling-button.element.ts index f56f5874c4..c1c7627962 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/components/log-viewer-polling-button.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/components/log-viewer-polling-button.element.ts @@ -1,12 +1,7 @@ -import type { - PoolingCOnfig, - PoolingInterval, - UmbLogViewerWorkspaceContext} from '../../../logviewer.context.js'; -import { - UMB_APP_LOG_VIEWER_CONTEXT, -} from '../../../logviewer.context.js'; +import type { PoolingCOnfig, PoolingInterval, UmbLogViewerWorkspaceContext } from '../../../logviewer.context.js'; +import { UMB_APP_LOG_VIEWER_CONTEXT } from '../../../logviewer.context.js'; import { css, html, customElement, query, state } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbDropdownElement } from '@umbraco-cms/backoffice/components'; @customElement('umb-log-viewer-polling-button') diff --git a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/components/log-viewer-search-input-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/components/log-viewer-search-input-modal.element.ts index a23a629179..9dc27166f6 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/components/log-viewer-search-input-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/components/log-viewer-search-input-modal.element.ts @@ -1,7 +1,7 @@ import { html, css, customElement, query, state } from '@umbraco-cms/backoffice/external/lit'; import type { UUIInputElement } from '@umbraco-cms/backoffice/external/uui'; import { UmbModalBaseElement } from '@umbraco-cms/backoffice/modal'; -import type { SavedLogSearchPresenationBaseModel } from '@umbraco-cms/backoffice/backend-api'; +import type { SavedLogSearchPresenationBaseModel } from '@umbraco-cms/backoffice/external/backend-api'; @customElement('umb-log-viewer-save-search-modal') export default class UmbLogViewerSaveSearchModalElement extends UmbModalBaseElement< diff --git a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/components/log-viewer-search-input.element.ts b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/components/log-viewer-search-input.element.ts index 8250f6e4d7..77139d5732 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/components/log-viewer-search-input.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/components/log-viewer-search-input.element.ts @@ -1,19 +1,13 @@ -import type { UmbLogViewerWorkspaceContext} from '../../../logviewer.context.js'; +import type { UmbLogViewerWorkspaceContext } from '../../../logviewer.context.js'; import { UMB_APP_LOG_VIEWER_CONTEXT } from '../../../logviewer.context.js'; import type { UUIInputElement } from '@umbraco-cms/backoffice/external/uui'; import { css, html, customElement, query, state } from '@umbraco-cms/backoffice/external/lit'; import { Subject, debounceTime, tap } from '@umbraco-cms/backoffice/external/rxjs'; -import type { SavedLogSearchResponseModel } from '@umbraco-cms/backoffice/backend-api'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import type { SavedLogSearchResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { query as getQuery, path, toQueryString } from '@umbraco-cms/backoffice/router'; -import type { - UmbModalManagerContext, - UmbModalContext} from '@umbraco-cms/backoffice/modal'; -import { - UMB_MODAL_MANAGER_CONTEXT, - UmbModalToken, - UMB_CONFIRM_MODAL, -} from '@umbraco-cms/backoffice/modal'; +import type { UmbModalManagerContext, UmbModalContext } from '@umbraco-cms/backoffice/modal'; +import { UMB_MODAL_MANAGER_CONTEXT, UmbModalToken, UMB_CONFIRM_MODAL } from '@umbraco-cms/backoffice/modal'; import './log-viewer-search-input-modal.element.js'; import type { UmbDropdownElement } from '@umbraco-cms/backoffice/components'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/log-search-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/log-search-view.element.ts index 54004484f3..9443eb507a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/log-search-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/log-search-view.element.ts @@ -1,8 +1,8 @@ -import type { UmbLogViewerWorkspaceContext} from '../../logviewer.context.js'; +import type { UmbLogViewerWorkspaceContext } from '../../logviewer.context.js'; import { UMB_APP_LOG_VIEWER_CONTEXT } from '../../logviewer.context.js'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbObserverController } from '@umbraco-cms/backoffice/observable-api'; @customElement('umb-log-viewer-search-view') diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/components/input-media-type/input-media-type.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/components/input-media-type/input-media-type.element.ts index a10e9f5216..db647e8ac0 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/components/input-media-type/input-media-type.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/components/input-media-type/input-media-type.element.ts @@ -2,7 +2,7 @@ import type { UmbMediaTypeItemModel } from '../../repository/index.js'; import { UmbMediaTypePickerContext } from './input-media-type.context.js'; import { css, html, customElement, property, state, ifDefined, repeat } from '@umbraco-cms/backoffice/external/lit'; import { FormControlMixin } from '@umbraco-cms/backoffice/external/uui'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { splitStringToArray } from '@umbraco-cms/backoffice/utils'; @customElement('umb-input-media-type') diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/entity-actions/create/modal/media-type-create-options-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/entity-actions/create/modal/media-type-create-options-modal.element.ts index d4d0e13713..ea4506aa46 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/entity-actions/create/modal/media-type-create-options-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/entity-actions/create/modal/media-type-create-options-modal.element.ts @@ -8,7 +8,7 @@ import { UMB_MODAL_MANAGER_CONTEXT, } from '@umbraco-cms/backoffice/modal'; import { UMB_FOLDER_CREATE_MODAL } from '@umbraco-cms/backoffice/tree'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-media-type-create-options-modal') export class UmbDataTypeCreateOptionsModalElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/detail/media-type-detail.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/detail/media-type-detail.server.data-source.ts index a4b81e7a76..291f8babae 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/detail/media-type-detail.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/detail/media-type-detail.server.data-source.ts @@ -2,8 +2,11 @@ import type { UmbMediaTypeDetailModel } from '../../types.js'; import { UMB_MEDIA_TYPE_ENTITY_TYPE } from '../../entity.js'; import { UmbId } from '@umbraco-cms/backoffice/id'; import type { UmbDetailDataSource } from '@umbraco-cms/backoffice/repository'; -import type { CreateMediaTypeRequestModel, UpdateMediaTypeRequestModel } from '@umbraco-cms/backoffice/backend-api'; -import { MediaTypeResource } from '@umbraco-cms/backoffice/backend-api'; +import type { + CreateMediaTypeRequestModel, + UpdateMediaTypeRequestModel, +} from '@umbraco-cms/backoffice/external/backend-api'; +import { MediaTypeResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; import type { UmbPropertyTypeContainerModel } from '@umbraco-cms/backoffice/content-type'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/item/media-type-item.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/item/media-type-item.server.data-source.ts index 5d7e31672f..1e0529824e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/item/media-type-item.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/item/media-type-item.server.data-source.ts @@ -1,7 +1,7 @@ import type { UmbMediaTypeItemModel } from './types.js'; import { UmbItemServerDataSourceBase } from '@umbraco-cms/backoffice/repository'; -import type { MediaTypeItemResponseModel } from '@umbraco-cms/backoffice/backend-api'; -import { MediaTypeResource } from '@umbraco-cms/backoffice/backend-api'; +import type { MediaTypeItemResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { MediaTypeResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; /** diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/item/media-type-item.store.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/item/media-type-item.store.ts index 682d62c3bd..c5ec91c90e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/item/media-type-item.store.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/repository/item/media-type-item.store.ts @@ -6,7 +6,7 @@ import { UmbItemStoreBase } from '@umbraco-cms/backoffice/store'; /** * @export * @class UmbMediaTypeItemStore - * @extends {UmbEntityItemStore} + * @extends {UmbItemStoreBase} * @description - Data Store for Media Type items */ diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/tree/folder/media-type-folder.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/tree/folder/media-type-folder.server.data-source.ts index 73d6d18af9..e73d635e22 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/tree/folder/media-type-folder.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/tree/folder/media-type-folder.server.data-source.ts @@ -1,5 +1,5 @@ import type { UmbCreateFolderModel, UmbFolderDataSource, UmbUpdateFolderModel } from '@umbraco-cms/backoffice/tree'; -import { MediaTypeResource } from '@umbraco-cms/backoffice/backend-api'; +import { MediaTypeResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/tree/media-type-tree.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/tree/media-type-tree.server.data-source.ts index 608a211218..eed841f081 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/tree/media-type-tree.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/tree/media-type-tree.server.data-source.ts @@ -1,7 +1,7 @@ import { UMB_MEDIA_TYPE_ENTITY_TYPE, UMB_MEDIA_TYPE_FOLDER_ENTITY_TYPE } from '../entity.js'; import type { UmbMediaTypeTreeItemModel } from './types.js'; -import type { MediaTypeTreeItemResponseModel } from '@umbraco-cms/backoffice/backend-api'; -import { MediaTypeResource } from '@umbraco-cms/backoffice/backend-api'; +import type { MediaTypeTreeItemResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { MediaTypeResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { UmbTreeServerDataSourceBase } from '@umbraco-cms/backoffice/tree'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/manifests.ts index fc77cea2eb..a21c2fc8e8 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/manifests.ts @@ -2,7 +2,6 @@ import type { ManifestWorkspace, ManifestWorkspaceAction, ManifestWorkspaceView, - ManifestWorkspaceViewCollection, } from '@umbraco-cms/backoffice/extension-registry'; import { UmbSaveWorkspaceAction } from '@umbraco-cms/backoffice/workspace'; @@ -55,7 +54,7 @@ const workspaceViews: Array = [ ], }, ]; -const workspaceViewCollections: Array = []; + const workspaceActions: Array = [ { type: 'workspaceAction', @@ -76,4 +75,4 @@ const workspaceActions: Array = [ }, ]; -export const manifests = [workspace, ...workspaceViews, ...workspaceViewCollections, ...workspaceActions]; +export const manifests = [workspace, ...workspaceViews, ...workspaceActions]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/media-type-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/media-type-workspace-editor.element.ts index 6691c7270f..3358ac83af 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/media-type-workspace-editor.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/media-type-workspace-editor.element.ts @@ -1,14 +1,10 @@ import type { UmbMediaTypeWorkspaceContext } from './media-type-workspace.context.js'; -import type { UUIInputElement} from '@umbraco-cms/backoffice/external/uui'; +import type { UUIInputElement } from '@umbraco-cms/backoffice/external/uui'; import { UUIInputEvent } from '@umbraco-cms/backoffice/external/uui'; import { css, html, customElement, state, ifDefined } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; -import type { - UmbModalManagerContext} from '@umbraco-cms/backoffice/modal'; -import { - UMB_ICON_PICKER_MODAL, - UMB_MODAL_MANAGER_CONTEXT -} from '@umbraco-cms/backoffice/modal'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; +import type { UmbModalManagerContext } from '@umbraco-cms/backoffice/modal'; +import { UMB_ICON_PICKER_MODAL, UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal'; import { UMB_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/workspace'; import { generateAlias } from '@umbraco-cms/backoffice/utils'; @customElement('umb-media-type-workspace-editor') diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/media-type-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/media-type-workspace.element.ts index be4bc069b6..fb110123a1 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/media-type-workspace.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/media-type-workspace.element.ts @@ -2,7 +2,7 @@ import { UmbMediaTypeWorkspaceContext } from './media-type-workspace.context.js' import { UmbMediaTypeWorkspaceEditorElement } from './media-type-workspace-editor.element.js'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbRoute } from '@umbraco-cms/backoffice/router'; import { UmbWorkspaceIsNewRedirectController } from '@umbraco-cms/backoffice/workspace'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/views/design/media-type-workspace-view-edit-properties.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/views/design/media-type-workspace-view-edit-properties.element.ts index 00d6701914..e5ff01a8d5 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/views/design/media-type-workspace-view-edit-properties.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/views/design/media-type-workspace-view-edit-properties.element.ts @@ -7,7 +7,7 @@ import type { UmbPropertyContainerTypes, UmbPropertyTypeModel } from '@umbraco-c import { UmbContentTypePropertyStructureHelper } from '@umbraco-cms/backoffice/content-type'; import type { UmbSorterConfig } from '@umbraco-cms/backoffice/sorter'; import { UmbSorterController } from '@umbraco-cms/backoffice/sorter'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { UMB_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/workspace'; import { UMB_PROPERTY_SETTINGS_MODAL, UmbModalRouteRegistrationController } from '@umbraco-cms/backoffice/modal'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/views/design/media-type-workspace-view-edit-property.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/views/design/media-type-workspace-view-edit-property.element.ts index eda5094e00..ebd4bfb9ac 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/views/design/media-type-workspace-view-edit-property.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/views/design/media-type-workspace-view-edit-property.element.ts @@ -10,7 +10,7 @@ import { UMB_WORKSPACE_MODAL, UmbModalRouteRegistrationController, } from '@umbraco-cms/backoffice/modal'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { generateAlias } from '@umbraco-cms/backoffice/utils'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import type { UmbPropertyTypeModel } from '@umbraco-cms/backoffice/content-type'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/views/design/media-type-workspace-view-edit-tab.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/views/design/media-type-workspace-view-edit-tab.element.ts index 86fb523d9d..bd1182d885 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/views/design/media-type-workspace-view-edit-tab.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/views/design/media-type-workspace-view-edit-tab.element.ts @@ -3,8 +3,8 @@ import type { UmbMediaTypeDetailModel } from '../../../types.js'; import { css, html, customElement, property, state, repeat, ifDefined } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { UmbContentTypeContainerStructureHelper } from '@umbraco-cms/backoffice/content-type'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; -import type { PropertyTypeContainerModelBaseModel } from '@umbraco-cms/backoffice/backend-api'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; +import type { PropertyTypeContainerModelBaseModel } from '@umbraco-cms/backoffice/external/backend-api'; import { UMB_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/workspace'; import type { UmbSorterConfig } from '@umbraco-cms/backoffice/sorter'; import { UmbSorterController } from '@umbraco-cms/backoffice/sorter'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/views/design/media-type-workspace-view-edit.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/views/design/media-type-workspace-view-edit.element.ts index 9d891d5964..1b2d9d7628 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/views/design/media-type-workspace-view-edit.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/views/design/media-type-workspace-view-edit.element.ts @@ -5,8 +5,8 @@ import { css, html, customElement, state, repeat, nothing, ifDefined } from '@um import type { UUIInputElement, UUIInputEvent } from '@umbraco-cms/backoffice/external/uui'; import { UmbContentTypeContainerStructureHelper } from '@umbraco-cms/backoffice/content-type'; import { encodeFolderName } from '@umbraco-cms/backoffice/router'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; -import type { PropertyTypeContainerModelBaseModel } from '@umbraco-cms/backoffice/backend-api'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; +import type { PropertyTypeContainerModelBaseModel } from '@umbraco-cms/backoffice/external/backend-api'; import { UMB_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/workspace'; import type { UmbRoute, UmbRouterSlotChangeEvent, UmbRouterSlotInitEvent } from '@umbraco-cms/backoffice/router'; import type { UmbWorkspaceViewElement } from '@umbraco-cms/backoffice/extension-registry'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/views/structure/media-type-workspace-view-structure.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/views/structure/media-type-workspace-view-structure.element.ts index 64f8cbd709..2608977233 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/views/structure/media-type-workspace-view-structure.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/views/structure/media-type-workspace-view-structure.element.ts @@ -3,7 +3,7 @@ import type { UmbInputMediaTypeElement } from '../../../components/input-media-t import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import type { UUIToggleElement } from '@umbraco-cms/backoffice/external/uui'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { UMB_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/workspace'; import type { UmbWorkspaceViewElement } from '@umbraco-cms/backoffice/extension-registry'; import type { UmbContentTypeSortModel } from '@umbraco-cms/backoffice/content-type'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/collection-view/media-grid-collection-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/collection-view/media-grid-collection-view.element.ts index 15d6e8e15f..8944526b66 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/collection-view/media-grid-collection-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/collection-view/media-grid-collection-view.element.ts @@ -1,8 +1,8 @@ import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { css, html, customElement, state, repeat } from '@umbraco-cms/backoffice/external/lit'; -import type { UmbDefaultCollectionContext} from '@umbraco-cms/backoffice/collection'; +import type { UmbDefaultCollectionContext } from '@umbraco-cms/backoffice/collection'; import { UMB_DEFAULT_COLLECTION_CONTEXT } from '@umbraco-cms/backoffice/collection'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbEntityTreeItemModel } from '@umbraco-cms/backoffice/tree'; @customElement('umb-media-grid-collection-view') diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/collection-view/media-table-collection-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/collection-view/media-table-collection-view.element.ts index 9b60943705..e5b08d02c2 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/collection-view/media-table-collection-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/collection-view/media-table-collection-view.element.ts @@ -10,9 +10,9 @@ import type { UmbTableOrderedEvent, UmbTableSelectedEvent, } from '@umbraco-cms/backoffice/components'; -import type { UmbDefaultCollectionContext} from '@umbraco-cms/backoffice/collection'; +import type { UmbDefaultCollectionContext } from '@umbraco-cms/backoffice/collection'; import { UMB_DEFAULT_COLLECTION_CONTEXT } from '@umbraco-cms/backoffice/collection'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-media-table-collection-view') export class UmbMediaTableCollectionViewElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/components/input-media/input-media.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/components/input-media/input-media.element.ts index 99eb4b2ff9..57ff4b6024 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/components/input-media/input-media.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/components/input-media/input-media.element.ts @@ -2,7 +2,7 @@ import type { UmbMediaItemModel } from '../../repository/index.js'; import { UmbMediaPickerContext } from './input-media.context.js'; import { css, html, customElement, property, state, ifDefined, repeat } from '@umbraco-cms/backoffice/external/lit'; import { FormControlMixin } from '@umbraco-cms/backoffice/external/uui'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { splitStringToArray } from '@umbraco-cms/backoffice/utils'; import { UMB_WORKSPACE_MODAL, UmbModalRouteRegistrationController } from '@umbraco-cms/backoffice/modal'; import { type UmbSorterConfig, UmbSorterController } from '@umbraco-cms/backoffice/sorter'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/image-cropper/property-editor-ui-image-cropper.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/image-cropper/property-editor-ui-image-cropper.element.ts index c76cd11fd7..8b669716ec 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/image-cropper/property-editor-ui-image-cropper.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/image-cropper/property-editor-ui-image-cropper.element.ts @@ -1,7 +1,7 @@ import { html, customElement, property } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor'; import '../../components/input-image-cropper/input-image-cropper.element.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/image-crops-configuration/property-editor-ui-image-crops-configuration.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/image-crops-configuration/property-editor-ui-image-crops-configuration.element.ts index a0fc22c28d..75bc97b2a9 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/image-crops-configuration/property-editor-ui-image-crops-configuration.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/image-crops-configuration/property-editor-ui-image-crops-configuration.element.ts @@ -1,7 +1,7 @@ import { html, customElement, property, css, repeat, state } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; export type UmbCrop = { alias: string; diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/image-crops-configuration/property-editor-ui-image-crops-configuration.test.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/image-crops-configuration/property-editor-ui-image-crops-configuration.test.ts index 36c87d4d3c..f9676a42c7 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/image-crops-configuration/property-editor-ui-image-crops-configuration.test.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/image-crops-configuration/property-editor-ui-image-crops-configuration.test.ts @@ -1,5 +1,6 @@ import { expect, fixture, html } from '@open-wc/testing'; import { UmbPropertyEditorUIImageCropsConfigurationElement } from './property-editor-ui-image-crops-configuration.element.js'; +import type { UmbTestRunnerWindow } from '@umbraco-cms/internal/test-utils'; //import { type UmbTestRunnerWindow, defaultA11yConfig } from '@umbraco-cms/internal/test-utils'; describe('UmbPropertyEditorUIImageCropsConfigurationElement', () => { @@ -15,10 +16,12 @@ describe('UmbPropertyEditorUIImageCropsConfigurationElement', () => { expect(element).to.be.instanceOf(UmbPropertyEditorUIImageCropsConfigurationElement); }); + /* if ((window as UmbTestRunnerWindow).__UMBRACO_TEST_RUN_A11Y_TEST) { it('passes the a11y audit', async () => { //TODO: This test is broken. It fails at forms because of missing labels even if you have them. // await expect(element).shadowDom.to.be.accessible(defaultA11yConfig); }); } + */ }); diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/media-picker/property-editor-ui-media-picker.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/media-picker/property-editor-ui-media-picker.element.ts index f4f5b4f60f..46c7a69758 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/media-picker/property-editor-ui-media-picker.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/media-picker/property-editor-ui-media-picker.element.ts @@ -3,7 +3,7 @@ import '../../components/input-media/input-media.element.js'; import { html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit'; import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor'; import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; /** * @element umb-property-editor-ui-media-picker diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/repository/detail/media-detail.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/repository/detail/media-detail.server.data-source.ts index b8f2d3402d..ae8bba794c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/repository/detail/media-detail.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/repository/detail/media-detail.server.data-source.ts @@ -2,8 +2,8 @@ import type { UmbMediaDetailModel } from '../../types.js'; import { UMB_MEDIA_ENTITY_TYPE } from '../../entity.js'; import { UmbId } from '@umbraco-cms/backoffice/id'; import type { UmbDetailDataSource } from '@umbraco-cms/backoffice/repository'; -import type { CreateMediaRequestModel, UpdateMediaRequestModel } from '@umbraco-cms/backoffice/backend-api'; -import { MediaResource } from '@umbraco-cms/backoffice/backend-api'; +import type { CreateMediaRequestModel, UpdateMediaRequestModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { MediaResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/repository/item/media-item.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/repository/item/media-item.server.data-source.ts index 17a6e1b181..dab8759fc6 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/repository/item/media-item.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/repository/item/media-item.server.data-source.ts @@ -1,6 +1,6 @@ import type { UmbMediaItemModel } from './types.js'; -import type { MediaItemResponseModel } from '@umbraco-cms/backoffice/backend-api'; -import { MediaResource } from '@umbraco-cms/backoffice/backend-api'; +import type { MediaItemResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { MediaResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { UmbItemServerDataSourceBase } from '@umbraco-cms/backoffice/repository'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/tree/media-tree.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/tree/media-tree.server.data-source.ts index 6ea46cd90b..e992c0628d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/tree/media-tree.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/tree/media-tree.server.data-source.ts @@ -1,7 +1,7 @@ import { UMB_MEDIA_ENTITY_TYPE } from '../entity.js'; import type { UmbMediaTreeItemModel } from './types.js'; import { UmbTreeServerDataSourceBase } from '@umbraco-cms/backoffice/tree'; -import { MediaResource, type MediaTreeItemResponseModel } from '@umbraco-cms/backoffice/backend-api'; +import { MediaResource, type MediaTreeItemResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; /** diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/types.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/types.ts index e7f2db9532..92427057b9 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/types.ts @@ -1,6 +1,6 @@ import type { UmbMediaEntityType } from './entity.js'; import type { UmbVariantModel } from '@umbraco-cms/backoffice/variant'; -import type { MediaUrlInfoModel, MediaValueModel } from '@umbraco-cms/backoffice/backend-api'; +import type { MediaUrlInfoModel, MediaValueModel } from '@umbraco-cms/backoffice/external/backend-api'; export interface UmbMediaDetailModel { mediaType: { unique: string }; diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/manifests.ts index 7c50664107..7c15570987 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/manifests.ts @@ -4,7 +4,6 @@ import type { ManifestWorkspace, ManifestWorkspaceAction, ManifestWorkspaceView, - ManifestWorkspaceViewCollection, } from '@umbraco-cms/backoffice/extension-registry'; const workspace: ManifestWorkspace = { @@ -19,6 +18,24 @@ const workspace: ManifestWorkspace = { }; const workspaceViews: Array = [ + // { + // type: 'workspaceView', + // alias: 'Umb.WorkspaceView.Media.Collection', + // name: 'Media Workspace Collection View', + // element: () => import('./views/collection/media-collection-workspace-view.element.js'), + // weight: 300, + // meta: { + // label: 'Media', + // pathname: 'collection', + // icon: 'icon-grid', + // }, + // conditions: [ + // { + // alias: 'Umb.Condition.WorkspaceAlias', + // match: workspace.alias, + // }, + // ], + // }, { type: 'workspaceView', alias: 'Umb.WorkspaceView.Media.Edit', @@ -57,28 +74,6 @@ const workspaceViews: Array = [ }, ]; -const workspaceViewCollections: Array = [ - { - type: 'workspaceViewCollection', - alias: 'Umb.WorkspaceView.Media.Collection', - name: 'Media Workspace Collection View', - weight: 300, - meta: { - label: 'Media', - pathname: 'collection', - icon: 'icon-grid', - entityType: 'media', - repositoryAlias: UMB_MEDIA_DETAIL_REPOSITORY_ALIAS, - }, - conditions: [ - { - alias: 'Umb.Condition.WorkspaceAlias', - match: workspace.alias, - }, - ], - }, -]; - const workspaceActions: Array = [ { type: 'workspaceAction', @@ -99,4 +94,4 @@ const workspaceActions: Array = [ }, ]; -export const manifests = [workspace, ...workspaceViews, ...workspaceViewCollections, ...workspaceActions]; +export const manifests = [workspace, ...workspaceViews, ...workspaceActions]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/media-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/media-workspace-editor.element.ts index 5dba697b66..61805598f9 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/media-workspace-editor.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/media-workspace-editor.element.ts @@ -1,7 +1,7 @@ import { UMB_MEDIA_WORKSPACE_CONTEXT } from './media-workspace.context.js'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { css, html, nothing, customElement, state } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-media-workspace-editor') export class UmbMediaWorkspaceEditorElement extends UmbLitElement { @state() diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/media-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/media-workspace.element.ts index 76bdc799e3..5aaa088d30 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/media-workspace.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/media-workspace.element.ts @@ -3,7 +3,7 @@ import { UmbMediaWorkspaceEditorElement } from './media-workspace-editor.element import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; import type { UmbRoute } from '@umbraco-cms/backoffice/router'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { type UmbApi, createExtensionApi, UmbExtensionsApiInitializer } from '@umbraco-cms/backoffice/extension-api'; import { umbExtensionsRegistry, type ManifestWorkspace } from '@umbraco-cms/backoffice/extension-registry'; import { UmbWorkspaceIsNewRedirectController } from '@umbraco-cms/backoffice/workspace'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/views/edit/media-edit-workspace-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/views/edit/media-edit-workspace-view.element.ts index 71b3730d6e..815d58733d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/views/edit/media-edit-workspace-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/views/edit/media-edit-workspace-view.element.ts @@ -1,6 +1,6 @@ import { css, html, customElement } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbWorkspaceViewElement } from '@umbraco-cms/backoffice/extension-registry'; @customElement('umb-media-edit-workspace-view') diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/views/info/media-info-workspace-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/views/info/media-info-workspace-view.element.ts index 06fdb068fa..32aaa56800 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/views/info/media-info-workspace-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/views/info/media-info-workspace-view.element.ts @@ -1,6 +1,6 @@ import { css, html, customElement } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbWorkspaceViewElement } from '@umbraco-cms/backoffice/extension-registry'; @customElement('umb-media-info-workspace-view') diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member-groups/tree/member-group-tree.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-groups/tree/member-group-tree.server.data-source.ts index 31bc04f6e2..ce9ef30319 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/members/member-groups/tree/member-group-tree.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/member-groups/tree/member-group-tree.server.data-source.ts @@ -1,7 +1,7 @@ import type { UmbMemberGroupTreeItemModel } from './types.js'; import { UmbTreeServerDataSourceBase } from '@umbraco-cms/backoffice/tree'; -import type { NamedEntityTreeItemResponseModel } from '@umbraco-cms/backoffice/backend-api'; -import { MemberGroupResource } from '@umbraco-cms/backoffice/backend-api'; +import type { NamedEntityTreeItemResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { MemberGroupResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; /** diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member-groups/workspace/member-group-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-groups/workspace/member-group-workspace.element.ts index 84ff228bb3..f24bc5b82e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/members/member-groups/workspace/member-group-workspace.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/member-groups/workspace/member-group-workspace.element.ts @@ -3,7 +3,7 @@ import { UmbMemberGroupWorkspaceContext } from './member-group-workspace.context import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; import type { UmbRoute } from '@umbraco-cms/backoffice/router'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-member-group-workspace') export class UmbMemberGroupWorkspaceElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member-types/components/input-member-type/input-member-type.context.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-types/components/input-member-type/input-member-type.context.ts index 27c58e2d86..61a614a237 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/members/member-types/components/input-member-type/input-member-type.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/member-types/components/input-member-type/input-member-type.context.ts @@ -2,7 +2,7 @@ import { UMB_MEMBER_TYPE_PICKER_MODAL } from '../../../../core/modal/token/membe import { UMB_MEMBER_TYPE_REPOSITORY_ALIAS } from '../../repository/index.js'; import { UmbPickerInputContext } from '@umbraco-cms/backoffice/picker-input'; import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api'; -import type { MemberTypeItemResponseModel } from '@umbraco-cms/backoffice/backend-api'; +import type { MemberTypeItemResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; export class UmbMemberTypePickerContext extends UmbPickerInputContext { constructor(host: UmbControllerHostElement) { diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member-types/components/input-member-type/input-member-type.element.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-types/components/input-member-type/input-member-type.element.ts index 77ce5219b7..b1849b713a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/members/member-types/components/input-member-type/input-member-type.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/member-types/components/input-member-type/input-member-type.element.ts @@ -1,8 +1,8 @@ import { UmbMemberTypePickerContext } from './input-member-type.context.js'; import { css, html, customElement, property, state, ifDefined, repeat } from '@umbraco-cms/backoffice/external/lit'; import { FormControlMixin } from '@umbraco-cms/backoffice/external/uui'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; -import type { MemberTypeItemResponseModel } from '@umbraco-cms/backoffice/backend-api'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; +import type { MemberTypeItemResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; import { splitStringToArray } from '@umbraco-cms/backoffice/utils'; @customElement('umb-input-member-type') diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member-types/tree/member-type-tree.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-types/tree/member-type-tree.server.data-source.ts index 8fd06852c1..c8455c267f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/members/member-types/tree/member-type-tree.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/member-types/tree/member-type-tree.server.data-source.ts @@ -1,7 +1,7 @@ import type { UmbMemberTypeTreeItemModel } from './types.js'; import { UmbTreeServerDataSourceBase } from '@umbraco-cms/backoffice/tree'; -import type { NamedEntityTreeItemResponseModel } from '@umbraco-cms/backoffice/backend-api'; -import { MemberTypeResource } from '@umbraco-cms/backoffice/backend-api'; +import type { NamedEntityTreeItemResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { MemberTypeResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; /** diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member-types/workspace/member-type-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-types/workspace/member-type-workspace-editor.element.ts index 5006df28c2..3c52ee30de 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/members/member-types/workspace/member-type-workspace-editor.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/member-types/workspace/member-type-workspace-editor.element.ts @@ -1,6 +1,6 @@ import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { css, html, customElement } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-member-type-workspace-editor') export class UmbMemberTypeWorkspaceEditorElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member-types/workspace/member-type-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-types/workspace/member-type-workspace.element.ts index 9c525fad2c..a2d50c3cd4 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/members/member-types/workspace/member-type-workspace.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/member-types/workspace/member-type-workspace.element.ts @@ -3,7 +3,7 @@ import { UmbMemberTypeWorkspaceContext } from './member-type-workspace.context.j import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; import type { UmbRoute } from '@umbraco-cms/backoffice/router'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-member-type-workspace') export class UmbMemberTypeWorkspaceElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/members/components/input-member/input-member.element.ts b/src/Umbraco.Web.UI.Client/src/packages/members/members/components/input-member/input-member.element.ts index f6ec06efb9..aa442c6fca 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/members/members/components/input-member/input-member.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/members/components/input-member/input-member.element.ts @@ -1,7 +1,7 @@ import { css, html, customElement, property, state, ifDefined, repeat } from '@umbraco-cms/backoffice/external/lit'; import { FormControlMixin } from '@umbraco-cms/backoffice/external/uui'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; -import type { MemberItemResponseModel } from '@umbraco-cms/backoffice/backend-api'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; +import type { MemberItemResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; import { splitStringToArray } from '@umbraco-cms/backoffice/utils'; import { UMB_WORKSPACE_MODAL, UmbModalRouteRegistrationController } from '@umbraco-cms/backoffice/modal'; import { type UmbSorterConfig, UmbSorterController } from '@umbraco-cms/backoffice/sorter'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/members/tree/member-tree.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/members/members/tree/member-tree.server.data-source.ts index 27c2775808..1c72c40514 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/members/members/tree/member-tree.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/members/tree/member-tree.server.data-source.ts @@ -1,5 +1,5 @@ import type { UmbMemberTreeItemModel } from './types.js'; -import type { NamedEntityTreeItemResponseModel } from '@umbraco-cms/backoffice/backend-api'; +import type { NamedEntityTreeItemResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { UmbTreeServerDataSourceBase } from '@umbraco-cms/backoffice/tree'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/members/workspace/member-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/packages/members/members/workspace/member-workspace.element.ts index 4a18290680..6c6f96ab95 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/members/members/workspace/member-workspace.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/members/workspace/member-workspace.element.ts @@ -3,7 +3,7 @@ import { UmbMemberWorkspaceContext } from './member-workspace.context.js'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; import type { UmbRoute } from '@umbraco-cms/backoffice/router'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-member-workspace') export class UmbMemberWorkspaceElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/models-builder/models-builder-dashboard.element.ts b/src/Umbraco.Web.UI.Client/src/packages/models-builder/models-builder-dashboard.element.ts index e4baaddc53..e9f08b1220 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/models-builder/models-builder-dashboard.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/models-builder/models-builder-dashboard.element.ts @@ -1,9 +1,9 @@ import type { UUIButtonState } from '@umbraco-cms/backoffice/external/uui'; import { css, html, nothing, customElement, state } from '@umbraco-cms/backoffice/external/lit'; -import type { ModelsBuilderResponseModel } from '@umbraco-cms/backoffice/backend-api'; -import { ModelsBuilderResource, ModelsModeModel } from '@umbraco-cms/backoffice/backend-api'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import type { ModelsBuilderResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { ModelsBuilderResource, ModelsModeModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/packages/package-builder/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/packages/package-builder/manifests.ts index b0d8074d46..c995a3b75a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/packages/package-builder/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/packages/package-builder/manifests.ts @@ -2,7 +2,6 @@ import type { ManifestWorkspace, ManifestWorkspaceAction, ManifestWorkspaceView, - ManifestWorkspaceViewCollection, } from '@umbraco-cms/backoffice/extension-registry'; const workspace: ManifestWorkspace = { @@ -16,7 +15,6 @@ const workspace: ManifestWorkspace = { }; const workspaceViews: Array = []; -const workspaceViewCollections: Array = []; const workspaceActions: Array = []; -export const manifests = [workspace, ...workspaceViews, ...workspaceViewCollections, ...workspaceActions]; +export const manifests = [workspace, ...workspaceViews, ...workspaceActions]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/packages/package-builder/workspace/workspace-package-builder.element.ts b/src/Umbraco.Web.UI.Client/src/packages/packages/package-builder/workspace/workspace-package-builder.element.ts index eb7c328839..f7737d0fbb 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/packages/package-builder/workspace/workspace-package-builder.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/packages/package-builder/workspace/workspace-package-builder.element.ts @@ -13,9 +13,9 @@ import { ifDefined, } from '@umbraco-cms/backoffice/external/lit'; // TODO: update to module imports when ready -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; -import type { PackageDefinitionResponseModel } from '@umbraco-cms/backoffice/backend-api'; -import { PackageResource } from '@umbraco-cms/backoffice/backend-api'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; +import type { PackageDefinitionResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { PackageResource } from '@umbraco-cms/backoffice/external/backend-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; import type { UmbNotificationContext } from '@umbraco-cms/backoffice/notification'; import { UMB_NOTIFICATION_CONTEXT } from '@umbraco-cms/backoffice/notification'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/packages/package-repo/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/packages/package-repo/manifests.ts index 75a196b40d..3c41125519 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/packages/package-repo/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/packages/package-repo/manifests.ts @@ -2,7 +2,6 @@ import type { ManifestWorkspace, ManifestWorkspaceAction, ManifestWorkspaceView, - ManifestWorkspaceViewCollection, } from '@umbraco-cms/backoffice/extension-registry'; const workspace: ManifestWorkspace = { @@ -16,7 +15,6 @@ const workspace: ManifestWorkspace = { }; const workspaceViews: Array = []; -const workspaceViewCollections: Array = []; const workspaceActions: Array = []; -export const manifests = [workspace, ...workspaceViews, ...workspaceViewCollections, ...workspaceActions]; +export const manifests = [workspace, ...workspaceViews, ...workspaceActions]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/created/created-packages-section-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/created/created-packages-section-view.element.ts index 02f21e2016..f1b3025128 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/created/created-packages-section-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/created/created-packages-section-view.element.ts @@ -3,7 +3,7 @@ import type { UmbRoute } from '@umbraco-cms/backoffice/router'; import type { ManifestWorkspace, UmbSectionViewElement } from '@umbraco-cms/backoffice/extension-registry'; import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; import { createExtensionElement } from '@umbraco-cms/backoffice/extension-api'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-created-packages-section-view') export class UmbCreatedPackagesSectionViewElement extends UmbLitElement implements UmbSectionViewElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/created/packages-created-overview.element.ts b/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/created/packages-created-overview.element.ts index 37095b16e5..c279b8bf73 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/created/packages-created-overview.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/created/packages-created-overview.element.ts @@ -1,10 +1,10 @@ import { html, css, nothing, ifDefined, customElement, state, repeat } from '@umbraco-cms/backoffice/external/lit'; import type { UUIPaginationEvent } from '@umbraco-cms/backoffice/external/uui'; -import type { PackageDefinitionResponseModel} from '@umbraco-cms/backoffice/backend-api'; -import { PackageResource } from '@umbraco-cms/backoffice/backend-api'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import type { PackageDefinitionResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { PackageResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; -import type { UmbModalManagerContext} from '@umbraco-cms/backoffice/modal'; +import type { UmbModalManagerContext } from '@umbraco-cms/backoffice/modal'; import { UMB_MODAL_MANAGER_CONTEXT, UMB_CONFIRM_MODAL } from '@umbraco-cms/backoffice/modal'; @customElement('umb-packages-created-overview') diff --git a/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/installed/installed-packages-section-view-item.element.ts b/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/installed/installed-packages-section-view-item.element.ts index dafcfa1760..bd0836c6e0 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/installed/installed-packages-section-view-item.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/installed/installed-packages-section-view-item.element.ts @@ -6,9 +6,9 @@ import { UMB_MODAL_MANAGER_CONTEXT, UMB_CONFIRM_MODAL } from '@umbraco-cms/backo import { createExtensionElement } from '@umbraco-cms/backoffice/extension-api'; import type { ManifestPackageView } from '@umbraco-cms/backoffice/extension-registry'; import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; -import { PackageResource } from '@umbraco-cms/backoffice/backend-api'; +import { PackageResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbNotificationContext } from '@umbraco-cms/backoffice/notification'; import { UMB_NOTIFICATION_CONTEXT } from '@umbraco-cms/backoffice/notification'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/installed/installed-packages-section-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/installed/installed-packages-section-view.element.ts index a4c8ec204c..58a65558ce 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/installed/installed-packages-section-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/installed/installed-packages-section-view.element.ts @@ -3,7 +3,7 @@ import type { UmbPackageWithMigrationStatus } from '../../../types.js'; import { html, css, customElement, state, repeat } from '@umbraco-cms/backoffice/external/lit'; import { combineLatest } from '@umbraco-cms/backoffice/external/rxjs'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbSectionViewElement } from '@umbraco-cms/backoffice/extension-registry'; import './installed-packages-section-view-item.element.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/market-place/packages-market-place-section-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/market-place/packages-market-place-section-view.element.ts index 8e62ee91b2..0044f62611 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/market-place/packages-market-place-section-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/market-place/packages-market-place-section-view.element.ts @@ -1,5 +1,5 @@ import { css, html, customElement, property } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbSectionViewElement } from '@umbraco-cms/backoffice/extension-registry'; @customElement('umb-packages-market-place-section-view') diff --git a/src/Umbraco.Web.UI.Client/src/packages/packages/package/repository/package.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/packages/package/repository/package.repository.ts index bfd4a68302..3c4f166346 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/packages/package/repository/package.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/packages/package/repository/package.repository.ts @@ -1,11 +1,11 @@ -import type { UmbPackageStore} from './package.store.js'; +import type { UmbPackageStore } from './package.store.js'; import { UMB_PACKAGE_STORE_TOKEN } from './package.store.js'; import { UmbPackageServerDataSource } from './sources/package.server.data.js'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; -import type { UmbApi, ManifestBase} from '@umbraco-cms/backoffice/extension-api'; +import type { UmbApi, ManifestBase } from '@umbraco-cms/backoffice/extension-api'; import { isManifestBaseType } from '@umbraco-cms/backoffice/extension-api'; -import { OpenAPI } from '@umbraco-cms/backoffice/backend-api'; +import { OpenAPI } from '@umbraco-cms/backoffice/external/backend-api'; /** * A repository for Packages which mimics a tree store. diff --git a/src/Umbraco.Web.UI.Client/src/packages/packages/package/repository/package.store.ts b/src/Umbraco.Web.UI.Client/src/packages/packages/package/repository/package.store.ts index a485cf71f3..317ff7c1c9 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/packages/package/repository/package.store.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/packages/package/repository/package.store.ts @@ -3,7 +3,7 @@ import { ReplaySubject } from '@umbraco-cms/backoffice/external/rxjs'; import { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api'; import { UmbStoreBase } from '@umbraco-cms/backoffice/store'; -import type { PackageMigrationStatusResponseModel } from '@umbraco-cms/backoffice/backend-api'; +import type { PackageMigrationStatusResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; import type { ManifestBase } from '@umbraco-cms/backoffice/extension-api'; import { UmbArrayState } from '@umbraco-cms/backoffice/observable-api'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/packages/package/repository/sources/package.server.data.ts b/src/Umbraco.Web.UI.Client/src/packages/packages/package/repository/sources/package.server.data.ts index 8200347ea2..d9422d71a9 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/packages/package/repository/sources/package.server.data.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/packages/package/repository/sources/package.server.data.ts @@ -1,4 +1,4 @@ -import { PackageResource } from '@umbraco-cms/backoffice/backend-api'; +import { PackageResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/packages/types.ts b/src/Umbraco.Web.UI.Client/src/packages/packages/types.ts index 19a9dce4fe..93ebce7414 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/packages/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/packages/types.ts @@ -1,4 +1,4 @@ -import type { PackageManifestResponseModel } from '@umbraco-cms/backoffice/backend-api'; +import type { PackageManifestResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; export type UmbPackage = PackageManifestResponseModel; diff --git a/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/repository/relation-type.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/repository/relation-type.repository.ts index d2eeca5a2f..df1e01da6e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/repository/relation-type.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/repository/relation-type.repository.ts @@ -1,12 +1,15 @@ -import type { UmbRelationTypeTreeStore} from '../tree/index.js'; +import type { UmbRelationTypeTreeStore } from '../tree/index.js'; import { UMB_RELATION_TYPE_TREE_STORE_CONTEXT } from '../tree/index.js'; import { UmbRelationTypeServerDataSource } from './sources/relation-type.server.data.js'; -import type { UmbRelationTypeStore} from './relation-type.store.js'; +import type { UmbRelationTypeStore } from './relation-type.store.js'; import { UMB_RELATION_TYPE_STORE_CONTEXT } from './relation-type.store.js'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; -import type { CreateRelationTypeRequestModel, UpdateRelationTypeRequestModel } from '@umbraco-cms/backoffice/backend-api'; -import type { UmbNotificationContext} from '@umbraco-cms/backoffice/notification'; +import type { + CreateRelationTypeRequestModel, + UpdateRelationTypeRequestModel, +} from '@umbraco-cms/backoffice/external/backend-api'; +import type { UmbNotificationContext } from '@umbraco-cms/backoffice/notification'; import { UMB_NOTIFICATION_CONTEXT } from '@umbraco-cms/backoffice/notification'; import type { UmbApi } from '@umbraco-cms/backoffice/extension-api'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/repository/relation-type.store.ts b/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/repository/relation-type.store.ts index c73cd30795..be06aa7656 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/repository/relation-type.store.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/repository/relation-type.store.ts @@ -1,4 +1,4 @@ -import type { RelationTypeResponseModel } from '@umbraco-cms/backoffice/backend-api'; +import type { RelationTypeResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; import { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; import { UmbArrayState } from '@umbraco-cms/backoffice/observable-api'; import { UmbStoreBase } from '@umbraco-cms/backoffice/store'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/repository/sources/relation-type.server.data.ts b/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/repository/sources/relation-type.server.data.ts index 65d9ea2aab..e46c2384b3 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/repository/sources/relation-type.server.data.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/repository/sources/relation-type.server.data.ts @@ -2,11 +2,9 @@ import type { UmbDataSource } from '@umbraco-cms/backoffice/repository'; import type { RelationTypeResponseModel, CreateRelationTypeRequestModel, - UpdateRelationTypeRequestModel} from '@umbraco-cms/backoffice/backend-api'; -import { - RelationTypeResource, - RelationResource, -} from '@umbraco-cms/backoffice/backend-api'; + UpdateRelationTypeRequestModel, +} from '@umbraco-cms/backoffice/external/backend-api'; +import { RelationTypeResource, RelationResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; import { UmbId } from '@umbraco-cms/backoffice/id'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/tree/relation-type-tree.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/tree/relation-type-tree.server.data-source.ts index 226eb46321..27320109f3 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/tree/relation-type-tree.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/tree/relation-type-tree.server.data-source.ts @@ -1,6 +1,6 @@ import type { UmbRelationTypeTreeItemModel } from './types.js'; -import type { NamedEntityTreeItemResponseModel } from '@umbraco-cms/backoffice/backend-api'; -import { RelationTypeResource } from '@umbraco-cms/backoffice/backend-api'; +import type { NamedEntityTreeItemResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { RelationTypeResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { UmbTreeServerDataSourceBase } from '@umbraco-cms/backoffice/tree'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/workspace/relation-type-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/workspace/relation-type-workspace-editor.element.ts index 0cf3af40ce..5ed4d7c78a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/workspace/relation-type-workspace-editor.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/workspace/relation-type-workspace-editor.element.ts @@ -1,9 +1,9 @@ import { UMB_RELATION_TYPE_WORKSPACE_CONTEXT } from './relation-type-workspace.context.js'; -import type { UUIInputElement} from '@umbraco-cms/backoffice/external/uui'; +import type { UUIInputElement } from '@umbraco-cms/backoffice/external/uui'; import { UUIInputEvent } from '@umbraco-cms/backoffice/external/uui'; import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; -import type { RelationTypeResponseModel } from '@umbraco-cms/backoffice/backend-api'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; +import type { RelationTypeResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; /** * @element umb-relation-type-workspace-editor * @description - Element for displaying a Relation Type Workspace diff --git a/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/workspace/relation-type-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/workspace/relation-type-workspace.context.ts index ee60e9fe2c..168ffd58ec 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/workspace/relation-type-workspace.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/workspace/relation-type-workspace.context.ts @@ -3,7 +3,7 @@ import { type UmbSaveableWorkspaceContextInterface, UmbEditableWorkspaceContextBase, } from '@umbraco-cms/backoffice/workspace'; -import type { RelationTypeBaseModel, RelationTypeResponseModel } from '@umbraco-cms/backoffice/backend-api'; +import type { RelationTypeBaseModel, RelationTypeResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; import { UmbObjectState } from '@umbraco-cms/backoffice/observable-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/workspace/relation-type-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/workspace/relation-type-workspace.element.ts index 7d5cb0c549..8bcc432fe8 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/workspace/relation-type-workspace.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/workspace/relation-type-workspace.element.ts @@ -2,7 +2,7 @@ import { UmbRelationTypeWorkspaceContext } from './relation-type-workspace.conte import { UmbRelationTypeWorkspaceEditorElement } from './relation-type-workspace-editor.element.js'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbRouterSlotInitEvent, UmbRoute } from '@umbraco-cms/backoffice/router'; import { UmbWorkspaceIsNewRedirectController } from '@umbraco-cms/backoffice/workspace'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/workspace/views/relation-type/relation-type-workspace-view-relation-type.element.ts b/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/workspace/views/relation-type/relation-type-workspace-view-relation-type.element.ts index 77c84fe1ce..ccb41338f7 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/workspace/views/relation-type/relation-type-workspace-view-relation-type.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/workspace/views/relation-type/relation-type-workspace-view-relation-type.element.ts @@ -7,8 +7,8 @@ import type { UUIToggleElement, } from '@umbraco-cms/backoffice/external/uui'; import { css, html, customElement, state, ifDefined } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; -import type { RelationTypeResponseModel } from '@umbraco-cms/backoffice/backend-api'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; +import type { RelationTypeResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbWorkspaceViewElement } from '@umbraco-cms/backoffice/extension-registry'; @customElement('umb-relation-type-workspace-view-relation-type') diff --git a/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/workspace/views/relation/workspace-view-relation-type-relation.element.ts b/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/workspace/views/relation/workspace-view-relation-type-relation.element.ts index 63f15997c0..a4f5cb3e01 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/workspace/views/relation/workspace-view-relation-type-relation.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/workspace/views/relation/workspace-view-relation-type-relation.element.ts @@ -2,8 +2,8 @@ import { UMB_RELATION_TYPE_WORKSPACE_CONTEXT } from '../../relation-type-workspa import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; import type { UmbTableColumn, UmbTableConfig, UmbTableItem } from '@umbraco-cms/backoffice/components'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; -import type { RelationResponseModel } from '@umbraco-cms/backoffice/backend-api'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; +import type { RelationResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbWorkspaceViewElement } from '@umbraco-cms/backoffice/extension-registry'; @customElement('umb-workspace-view-relation-type-relation') diff --git a/src/Umbraco.Web.UI.Client/src/packages/relations/relations/repository/sources/relation.server.data.ts b/src/Umbraco.Web.UI.Client/src/packages/relations/relations/repository/sources/relation.server.data.ts index 9e8845bcb9..91fa150b7d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/relations/relations/repository/sources/relation.server.data.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/relations/relations/repository/sources/relation.server.data.ts @@ -1,4 +1,4 @@ -import { RelationResource } from '@umbraco-cms/backoffice/backend-api'; +import { RelationResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/search/examine-management-dashboard/dashboard-examine-management.element.ts b/src/Umbraco.Web.UI.Client/src/packages/search/examine-management-dashboard/dashboard-examine-management.element.ts index 23a09d3751..fe8c82b27f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/search/examine-management-dashboard/dashboard-examine-management.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/search/examine-management-dashboard/dashboard-examine-management.element.ts @@ -3,7 +3,7 @@ import type { UmbDashboardExamineSearcherElement } from './views/section-view-ex import { html, css, nothing, customElement, state } from '@umbraco-cms/backoffice/external/lit'; import type { UmbRoute, UmbRouterSlotChangeEvent, UmbRouterSlotInitEvent } from '@umbraco-cms/backoffice/router'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-dashboard-examine-management') export class UmbDashboardExamineManagementElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/search/examine-management-dashboard/views/modal-views/fields-viewer.element.ts b/src/Umbraco.Web.UI.Client/src/packages/search/examine-management-dashboard/views/modal-views/fields-viewer.element.ts index 6d4d10223f..66fa6a5d0f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/search/examine-management-dashboard/views/modal-views/fields-viewer.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/search/examine-management-dashboard/views/modal-views/fields-viewer.element.ts @@ -1,7 +1,7 @@ import { html, css, nothing, customElement } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { UmbModalBaseElement } from '@umbraco-cms/backoffice/modal'; -import type { SearchResultResponseModel } from '@umbraco-cms/backoffice/backend-api'; +import type { SearchResultResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; @customElement('umb-modal-element-fields-viewer') export class UmbModalElementFieldsViewerElement extends UmbModalBaseElement< diff --git a/src/Umbraco.Web.UI.Client/src/packages/search/examine-management-dashboard/views/section-view-examine-indexers.ts b/src/Umbraco.Web.UI.Client/src/packages/search/examine-management-dashboard/views/section-view-examine-indexers.ts index 8f65775ed5..5550281658 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/search/examine-management-dashboard/views/section-view-examine-indexers.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/search/examine-management-dashboard/views/section-view-examine-indexers.ts @@ -1,10 +1,10 @@ import type { UUIButtonState } from '@umbraco-cms/backoffice/external/uui'; import { css, html, nothing, customElement, property, state } from '@umbraco-cms/backoffice/external/lit'; -import type { UmbModalManagerContext} from '@umbraco-cms/backoffice/modal'; +import type { UmbModalManagerContext } from '@umbraco-cms/backoffice/modal'; import { UMB_MODAL_MANAGER_CONTEXT, UMB_CONFIRM_MODAL } from '@umbraco-cms/backoffice/modal'; -import type { IndexResponseModel} from '@umbraco-cms/backoffice/backend-api'; -import { HealthStatusModel, IndexerResource } from '@umbraco-cms/backoffice/backend-api'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import type { IndexResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { HealthStatusModel, IndexerResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; import './section-view-examine-searchers.js'; @@ -151,7 +151,7 @@ export class UmbDashboardExamineIndexElement extends UmbLitElement { look="primary" .state="${this._buttonState}" @click="${this._onRebuildHandler}" - .disabled="${!this._indexData?.canRebuild ?? true}" + .disabled="${this._indexData?.canRebuild ? false : true}" label="Rebuild index"> Rebuild diff --git a/src/Umbraco.Web.UI.Client/src/packages/search/examine-management-dashboard/views/section-view-examine-overview.ts b/src/Umbraco.Web.UI.Client/src/packages/search/examine-management-dashboard/views/section-view-examine-overview.ts index 8d9842353a..dbd33c3214 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/search/examine-management-dashboard/views/section-view-examine-overview.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/search/examine-management-dashboard/views/section-view-examine-overview.ts @@ -1,15 +1,9 @@ import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { css, html, nothing, customElement, state } from '@umbraco-cms/backoffice/external/lit'; -import type { - IndexResponseModel, - SearcherResponseModel} from '@umbraco-cms/backoffice/backend-api'; -import { - HealthStatusModel, - IndexerResource, - SearcherResource, -} from '@umbraco-cms/backoffice/backend-api'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import type { IndexResponseModel, SearcherResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { HealthStatusModel, IndexerResource, SearcherResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; @customElement('umb-dashboard-examine-overview') diff --git a/src/Umbraco.Web.UI.Client/src/packages/search/examine-management-dashboard/views/section-view-examine-searchers.ts b/src/Umbraco.Web.UI.Client/src/packages/search/examine-management-dashboard/views/section-view-examine-searchers.ts index cf8d5c8486..3c5b896956 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/search/examine-management-dashboard/views/section-view-examine-searchers.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/search/examine-management-dashboard/views/section-view-examine-searchers.ts @@ -1,18 +1,10 @@ import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { css, html, nothing, customElement, state, query, property } from '@umbraco-cms/backoffice/external/lit'; -import type { - UmbModalManagerContext} from '@umbraco-cms/backoffice/modal'; -import { - UMB_MODAL_MANAGER_CONTEXT, - UMB_EXAMINE_FIELDS_SETTINGS_MODAL, -} from '@umbraco-cms/backoffice/modal'; -import type { - SearchResultResponseModel, - FieldPresentationModel} from '@umbraco-cms/backoffice/backend-api'; -import { - SearcherResource -} from '@umbraco-cms/backoffice/backend-api'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import type { UmbModalManagerContext } from '@umbraco-cms/backoffice/modal'; +import { UMB_MODAL_MANAGER_CONTEXT, UMB_EXAMINE_FIELDS_SETTINGS_MODAL } from '@umbraco-cms/backoffice/modal'; +import type { SearchResultResponseModel, FieldPresentationModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { SearcherResource } from '@umbraco-cms/backoffice/external/backend-api'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; import './modal-views/fields-viewer.element.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/search/umb-search-header-app.element.ts b/src/Umbraco.Web.UI.Client/src/packages/search/umb-search-header-app.element.ts index 4feff032c1..cfb84f7b06 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/search/umb-search-header-app.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/search/umb-search-header-app.element.ts @@ -1,9 +1,9 @@ import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; -import type { CSSResultGroup} from '@umbraco-cms/backoffice/external/lit'; +import type { CSSResultGroup } from '@umbraco-cms/backoffice/external/lit'; import { css, html, customElement } from '@umbraco-cms/backoffice/external/lit'; -import type { UmbModalManagerContext} from '@umbraco-cms/backoffice/modal'; +import type { UmbModalManagerContext } from '@umbraco-cms/backoffice/modal'; import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-search-header-app') export class UmbSearchHeaderAppElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/dashboards/performance-profiling/dashboard-performance-profiling.element.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/dashboards/performance-profiling/dashboard-performance-profiling.element.ts index 7d83d67da5..3931e17776 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/settings/dashboards/performance-profiling/dashboard-performance-profiling.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/settings/dashboards/performance-profiling/dashboard-performance-profiling.element.ts @@ -1,7 +1,7 @@ import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { css, html, customElement, state, query, unsafeHTML } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; -import { ProfilingResource } from '@umbraco-cms/backoffice/backend-api'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; +import { ProfilingResource } from '@umbraco-cms/backoffice/external/backend-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; @customElement('umb-dashboard-performance-profiling') diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/dashboards/published-status/dashboard-published-status.element.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/dashboards/published-status/dashboard-published-status.element.ts index 64e604f4ac..2f3f4e3f54 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/settings/dashboards/published-status/dashboard-published-status.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/settings/dashboards/published-status/dashboard-published-status.element.ts @@ -1,10 +1,10 @@ import type { UUIButtonState } from '@umbraco-cms/backoffice/external/uui'; import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; -import type { UmbModalManagerContext} from '@umbraco-cms/backoffice/modal'; +import type { UmbModalManagerContext } from '@umbraco-cms/backoffice/modal'; import { UMB_MODAL_MANAGER_CONTEXT, UMB_CONFIRM_MODAL } from '@umbraco-cms/backoffice/modal'; -import { PublishedCacheResource } from '@umbraco-cms/backoffice/backend-api'; +import { PublishedCacheResource } from '@umbraco-cms/backoffice/external/backend-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; @customElement('umb-dashboard-published-status') diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/dashboards/telemetry/dashboard-telemetry.element.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/dashboards/telemetry/dashboard-telemetry.element.ts index 1264a2d6db..3738b33a9a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/settings/dashboards/telemetry/dashboard-telemetry.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/settings/dashboards/telemetry/dashboard-telemetry.element.ts @@ -1,13 +1,8 @@ import { css, html, customElement, state, unsafeHTML } from '@umbraco-cms/backoffice/external/lit'; import type { UUIButtonState } from '@umbraco-cms/backoffice/external/uui'; -import type { - TelemetryResponseModel} from '@umbraco-cms/backoffice/backend-api'; -import { - TelemetryLevelModel, - TelemetryResource, - ApiError, -} from '@umbraco-cms/backoffice/backend-api'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import type { TelemetryResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { TelemetryLevelModel, TelemetryResource, ApiError } from '@umbraco-cms/backoffice/external/backend-api'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/static-file/components/input-static-file/input-static-file.element.ts b/src/Umbraco.Web.UI.Client/src/packages/static-file/components/input-static-file/input-static-file.element.ts index 2e0a9cf36b..ef744e57f8 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/static-file/components/input-static-file/input-static-file.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/static-file/components/input-static-file/input-static-file.element.ts @@ -2,7 +2,7 @@ import type { UmbStaticFileItemModel } from '../../repository/item/types.js'; import { UmbStaticFilePickerContext } from './input-static-file.context.js'; import { css, html, customElement, property, state, ifDefined, repeat } from '@umbraco-cms/backoffice/external/lit'; import { FormControlMixin } from '@umbraco-cms/backoffice/external/uui'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { splitStringToArray } from '@umbraco-cms/backoffice/utils'; @customElement('umb-input-static-file') diff --git a/src/Umbraco.Web.UI.Client/src/packages/static-file/modals/static-file-picker-modal.token.ts b/src/Umbraco.Web.UI.Client/src/packages/static-file/modals/static-file-picker-modal.token.ts index 98d2846fb3..2209fd678f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/static-file/modals/static-file-picker-modal.token.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/static-file/modals/static-file-picker-modal.token.ts @@ -1,5 +1,5 @@ import { UMB_STATIC_FILE_TREE_ALIAS } from '../tree/manifests.js'; -import type { StaticFileItemResponseModel } from '@umbraco-cms/backoffice/backend-api'; +import type { StaticFileItemResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbPickerModalValue, UmbTreePickerModalData } from '@umbraco-cms/backoffice/modal'; import { UmbModalToken } from '@umbraco-cms/backoffice/modal'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/static-file/property-editors/static-file-picker/property-editor-ui-static-file-picker.element.ts b/src/Umbraco.Web.UI.Client/src/packages/static-file/property-editors/static-file-picker/property-editor-ui-static-file-picker.element.ts index 297b68e483..4c2c5fd331 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/static-file/property-editors/static-file-picker/property-editor-ui-static-file-picker.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/static-file/property-editors/static-file-picker/property-editor-ui-static-file-picker.element.ts @@ -1,7 +1,7 @@ import type { UmbInputStaticFileElement } from '../../components/index.js'; import { html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit'; import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor'; import '../../components/input-static-file/index.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/static-file/repository/item/static-file-item.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/static-file/repository/item/static-file-item.server.data-source.ts index 84eeaf7c1f..294314b69c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/static-file/repository/item/static-file-item.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/static-file/repository/item/static-file-item.server.data-source.ts @@ -1,7 +1,7 @@ import type { UmbStaticFileItemModel } from './types.js'; import { UmbItemServerDataSourceBase } from '@umbraco-cms/backoffice/repository'; -import type { StaticFileItemResponseModel } from '@umbraco-cms/backoffice/backend-api'; -import { StaticFileResource } from '@umbraco-cms/backoffice/backend-api'; +import type { StaticFileItemResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { StaticFileResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; /** diff --git a/src/Umbraco.Web.UI.Client/src/packages/static-file/tree/static-file-tree.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/static-file/tree/static-file-tree.server.data-source.ts index 69181dffef..268ce50525 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/static-file/tree/static-file-tree.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/static-file/tree/static-file-tree.server.data-source.ts @@ -2,7 +2,10 @@ import { UMB_STATIC_FILE_ENTITY_TYPE, UMB_STATIC_FILE_FOLDER_ENTITY_TYPE } from import type { UmbStaticFileTreeItemModel } from './types.js'; import { UmbServerFilePathUniqueSerializer } from '@umbraco-cms/backoffice/server-file-system'; import { UmbTreeServerDataSourceBase } from '@umbraco-cms/backoffice/tree'; -import { StaticFileResource, type FileSystemTreeItemPresentationModel } from '@umbraco-cms/backoffice/backend-api'; +import { + StaticFileResource, + type FileSystemTreeItemPresentationModel, +} from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; /** diff --git a/src/Umbraco.Web.UI.Client/src/packages/tags/components/tags-input/tags-input.element.ts b/src/Umbraco.Web.UI.Client/src/packages/tags/components/tags-input/tags-input.element.ts index 9a955eed20..ff54c2f514 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/tags/components/tags-input/tags-input.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/tags/components/tags-input/tags-input.element.ts @@ -12,8 +12,8 @@ import { } from '@umbraco-cms/backoffice/external/lit'; import type { UUIInputElement, UUIInputEvent, UUITagElement } from '@umbraco-cms/backoffice/external/uui'; import { FormControlMixin } from '@umbraco-cms/backoffice/external/uui'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; -import type { TagResponseModel } from '@umbraco-cms/backoffice/backend-api'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; +import type { TagResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; @customElement('umb-tags-input') export class UmbTagsInputElement extends FormControlMixin(UmbLitElement) { diff --git a/src/Umbraco.Web.UI.Client/src/packages/tags/property-editors/tags/config/storage-type/property-editor-ui-tags-storage-type.element.ts b/src/Umbraco.Web.UI.Client/src/packages/tags/property-editors/tags/config/storage-type/property-editor-ui-tags-storage-type.element.ts index cd52ca5c88..c1afea732c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/tags/property-editors/tags/config/storage-type/property-editor-ui-tags-storage-type.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/tags/property-editors/tags/config/storage-type/property-editor-ui-tags-storage-type.element.ts @@ -2,7 +2,7 @@ import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extensi import { html, customElement, property } from '@umbraco-cms/backoffice/external/lit'; import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; /** * @element umb-property-editor-ui-tags-storage-type diff --git a/src/Umbraco.Web.UI.Client/src/packages/tags/property-editors/tags/property-editor-ui-tags.element.ts b/src/Umbraco.Web.UI.Client/src/packages/tags/property-editors/tags/property-editor-ui-tags.element.ts index 034d99d223..e71867fcae 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/tags/property-editors/tags/property-editor-ui-tags.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/tags/property-editors/tags/property-editor-ui-tags.element.ts @@ -4,7 +4,7 @@ import { html, customElement, property, state, ifDefined } from '@umbraco-cms/ba import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor'; import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; /** * @element umb-property-editor-ui-tags diff --git a/src/Umbraco.Web.UI.Client/src/packages/tags/repository/sources/tag.server.data.ts b/src/Umbraco.Web.UI.Client/src/packages/tags/repository/sources/tag.server.data.ts index 7868fa049e..5f88952d4b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/tags/repository/sources/tag.server.data.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/tags/repository/sources/tag.server.data.ts @@ -1,4 +1,4 @@ -import { TagResource } from '@umbraco-cms/backoffice/backend-api'; +import { TagResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/tags/repository/tag.store.ts b/src/Umbraco.Web.UI.Client/src/packages/tags/repository/tag.store.ts index f087b91baa..10fd3c5607 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/tags/repository/tag.store.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/tags/repository/tag.store.ts @@ -1,4 +1,4 @@ -import type { TagResponseModel } from '@umbraco-cms/backoffice/backend-api'; +import type { TagResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; import { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; import { UmbArrayState } from '@umbraco-cms/backoffice/observable-api'; import { UmbStoreBase } from '@umbraco-cms/backoffice/store'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/code-editor/code-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/code-editor/code-editor.element.ts index 59555b0d28..2270797d8b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/code-editor/code-editor.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/code-editor/code-editor.element.ts @@ -3,18 +3,9 @@ import type { CodeEditorLanguage, CodeEditorSearchOptions, UmbCodeEditorHost } f import { CodeEditorTheme } from './code-editor.model.js'; import { UMB_THEME_CONTEXT } from '@umbraco-cms/backoffice/themes'; import { monacoEditorStyles, monacoJumpingCursorHack } from '@umbraco-cms/backoffice/external/monaco-editor'; -import type { - PropertyValues, - Ref} from '@umbraco-cms/backoffice/external/lit'; -import { - css, - html, - createRef, - ref, - customElement, - property, -} from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import type { PropertyValues, Ref } from '@umbraco-cms/backoffice/external/lit'; +import { css, html, createRef, ref, customElement, property } from '@umbraco-cms/backoffice/external/lit'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; /** * A custom element that renders a code editor. Code editor is based on the Monaco Editor library. diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/components/insert-menu/templating-insert-menu.element.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/components/insert-menu/templating-insert-menu.element.ts index 8b22e1bfae..aab57ae965 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/components/insert-menu/templating-insert-menu.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/components/insert-menu/templating-insert-menu.element.ts @@ -17,7 +17,7 @@ import { UMB_PARTIAL_VIEW_PICKER_MODAL, UmbModalToken, } from '@umbraco-cms/backoffice/modal'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; export const UMB_MODAL_TEMPLATING_INSERT_CHOOSE_TYPE_SIDEBAR_MODAL = new UmbModalToken<{ hidePartialView: boolean }>( UMB_MODAL_TEMPLATING_INSERT_CHOOSE_TYPE_SIDEBAR_ALIAS, diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/entity-actions/create/snippet-modal/create-from-snippet-modal.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/entity-actions/create/snippet-modal/create-from-snippet-modal.ts index 578f15e830..2e89a5335b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/entity-actions/create/snippet-modal/create-from-snippet-modal.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/entity-actions/create/snippet-modal/create-from-snippet-modal.ts @@ -3,7 +3,7 @@ import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; import { UmbModalBaseElement } from '@umbraco-cms/backoffice/modal'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; -import { PartialViewResource } from '@umbraco-cms/backoffice/backend-api'; +import { PartialViewResource } from '@umbraco-cms/backoffice/external/backend-api'; interface UmbSnippetLinkModel { name: string; diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/entity-actions/rename/rename-partial-view.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/entity-actions/rename/rename-partial-view.server.data-source.ts index 93584d1425..df91eb5c04 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/entity-actions/rename/rename-partial-view.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/entity-actions/rename/rename-partial-view.server.data-source.ts @@ -3,8 +3,8 @@ import { UmbServerFilePathUniqueSerializer, appendFileExtensionIfNeeded, } from '@umbraco-cms/backoffice/server-file-system'; -import type { RenameStylesheetRequestModel} from '@umbraco-cms/backoffice/backend-api'; -import { PartialViewResource } from '@umbraco-cms/backoffice/backend-api'; +import type { RenameStylesheetRequestModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { PartialViewResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/repository/partial-view-detail.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/repository/partial-view-detail.server.data-source.ts index 1c61338c04..b2c3ed9012 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/repository/partial-view-detail.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/repository/partial-view-detail.server.data-source.ts @@ -4,8 +4,11 @@ import { UmbServerFilePathUniqueSerializer, appendFileExtensionIfNeeded, } from '@umbraco-cms/backoffice/server-file-system'; -import type { CreatePartialViewRequestModel, UpdatePartialViewRequestModel } from '@umbraco-cms/backoffice/backend-api'; -import { PartialViewResource } from '@umbraco-cms/backoffice/backend-api'; +import type { + CreatePartialViewRequestModel, + UpdatePartialViewRequestModel, +} from '@umbraco-cms/backoffice/external/backend-api'; +import { PartialViewResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import type { UmbDetailDataSource } from '@umbraco-cms/backoffice/repository'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/folder/partial-view-folder.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/folder/partial-view-folder.server.data-source.ts index 0d62a9d5d7..10794589c3 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/folder/partial-view-folder.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/folder/partial-view-folder.server.data-source.ts @@ -1,7 +1,7 @@ import { UmbServerFilePathUniqueSerializer } from '@umbraco-cms/backoffice/server-file-system'; import type { UmbCreateFolderModel, UmbFolderDataSource, UmbUpdateFolderModel } from '@umbraco-cms/backoffice/tree'; -import type { CreatePartialViewFolderRequestModel} from '@umbraco-cms/backoffice/backend-api'; -import { PartialViewResource } from '@umbraco-cms/backoffice/backend-api'; +import type { CreatePartialViewFolderRequestModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { PartialViewResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/partial-view-tree.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/partial-view-tree.server.data-source.ts index 518a8cbdf7..acc2290742 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/partial-view-tree.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/partial-view-tree.server.data-source.ts @@ -2,8 +2,8 @@ import { UMB_PARTIAL_VIEW_ENTITY_TYPE, UMB_PARTIAL_VIEW_FOLDER_ENTITY_TYPE } fro import type { UmbPartialViewTreeItemModel } from './types.js'; import { UmbServerFilePathUniqueSerializer } from '@umbraco-cms/backoffice/server-file-system'; import { UmbTreeServerDataSourceBase } from '@umbraco-cms/backoffice/tree'; -import type { FileSystemTreeItemPresentationModel } from '@umbraco-cms/backoffice/backend-api'; -import { PartialViewResource } from '@umbraco-cms/backoffice/backend-api'; +import type { FileSystemTreeItemPresentationModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { PartialViewResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; /** diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/workspace/partial-view-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/workspace/partial-view-workspace-editor.element.ts index 3069da8939..ddf433733e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/workspace/partial-view-workspace-editor.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/workspace/partial-view-workspace-editor.element.ts @@ -5,7 +5,7 @@ import { UMB_TEMPLATE_QUERY_BUILDER_MODAL } from '@umbraco-cms/backoffice/templa import type { UmbCodeEditorElement } from '@umbraco-cms/backoffice/code-editor'; import type { UUIInputElement } from '@umbraco-cms/backoffice/external/uui'; import { css, html, customElement, query, state } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbModalManagerContext } from '@umbraco-cms/backoffice/modal'; import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/workspace/partial-view-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/workspace/partial-view-workspace.context.ts index 4ef52f9b56..7a5eeaa4b0 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/workspace/partial-view-workspace.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/workspace/partial-view-workspace.context.ts @@ -3,15 +3,12 @@ import type { UmbPartialViewDetailModel } from '../types.js'; import { UMB_PARTIAL_VIEW_ENTITY_TYPE } from '../entity.js'; import { UmbBooleanState, UmbObjectState } from '@umbraco-cms/backoffice/observable-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; -import type { - UmbSaveableWorkspaceContextInterface} from '@umbraco-cms/backoffice/workspace'; -import { - UmbEditableWorkspaceContextBase, -} from '@umbraco-cms/backoffice/workspace'; +import type { UmbSaveableWorkspaceContextInterface } from '@umbraco-cms/backoffice/workspace'; +import { UmbEditableWorkspaceContextBase } from '@umbraco-cms/backoffice/workspace'; import { loadCodeEditor } from '@umbraco-cms/backoffice/code-editor'; import { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; -import { PartialViewResource } from '@umbraco-cms/backoffice/backend-api'; +import { PartialViewResource } from '@umbraco-cms/backoffice/external/backend-api'; export class UmbPartialViewWorkspaceContext extends UmbEditableWorkspaceContextBase diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/workspace/partial-view-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/workspace/partial-view-workspace.element.ts index f7409825a3..a989773089 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/workspace/partial-view-workspace.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/workspace/partial-view-workspace.element.ts @@ -2,7 +2,7 @@ import { UmbPartialViewWorkspaceContext } from './partial-view-workspace.context import { UmbPartialViewWorkspaceEditorElement } from './partial-view-workspace-editor.element.js'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbRoute, IRoutingInfo, PageComponent } from '@umbraco-cms/backoffice/router'; import { UmbWorkspaceIsNewRedirectController } from '@umbraco-cms/backoffice/workspace'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/entity-actions/rename/rename-script.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/entity-actions/rename/rename-script.server.data-source.ts index 0c850bc538..c6b077f36b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/entity-actions/rename/rename-script.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/entity-actions/rename/rename-script.server.data-source.ts @@ -3,8 +3,8 @@ import { UmbServerFilePathUniqueSerializer, appendFileExtensionIfNeeded, } from '@umbraco-cms/backoffice/server-file-system'; -import type { RenameStylesheetRequestModel} from '@umbraco-cms/backoffice/backend-api'; -import { ScriptResource } from '@umbraco-cms/backoffice/backend-api'; +import type { RenameStylesheetRequestModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { ScriptResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/repository/script-detail.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/repository/script-detail.server.data-source.ts index c36c4468c1..e0db5476c2 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/repository/script-detail.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/repository/script-detail.server.data-source.ts @@ -4,8 +4,8 @@ import { UmbServerFilePathUniqueSerializer, appendFileExtensionIfNeeded, } from '@umbraco-cms/backoffice/server-file-system'; -import type { CreateScriptRequestModel, UpdateScriptRequestModel } from '@umbraco-cms/backoffice/backend-api'; -import { ScriptResource } from '@umbraco-cms/backoffice/backend-api'; +import type { CreateScriptRequestModel, UpdateScriptRequestModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { ScriptResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import type { UmbDetailDataSource } from '@umbraco-cms/backoffice/repository'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/tree/folder/script-folder.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/tree/folder/script-folder.server.data-source.ts index 17e712a47c..7cebc48941 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/tree/folder/script-folder.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/tree/folder/script-folder.server.data-source.ts @@ -1,7 +1,7 @@ import { UmbServerFilePathUniqueSerializer } from '@umbraco-cms/backoffice/server-file-system'; import type { UmbCreateFolderModel, UmbFolderDataSource, UmbUpdateFolderModel } from '@umbraco-cms/backoffice/tree'; -import type { CreateScriptFolderRequestModel} from '@umbraco-cms/backoffice/backend-api'; -import { ScriptResource } from '@umbraco-cms/backoffice/backend-api'; +import type { CreateScriptFolderRequestModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { ScriptResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/tree/script-tree.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/tree/script-tree.server.data-source.ts index 3537ce874a..2a0330c9c2 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/tree/script-tree.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/tree/script-tree.server.data-source.ts @@ -2,8 +2,8 @@ import { UMB_SCRIPT_ENTITY_TYPE, UMB_SCRIPT_FOLDER_ENTITY_TYPE } from '../entity import type { UmbScriptTreeItemModel } from './types.js'; import { UmbServerFilePathUniqueSerializer } from '@umbraco-cms/backoffice/server-file-system'; import { UmbTreeServerDataSourceBase } from '@umbraco-cms/backoffice/tree'; -import type { FileSystemTreeItemPresentationModel } from '@umbraco-cms/backoffice/backend-api'; -import { ScriptResource } from '@umbraco-cms/backoffice/backend-api'; +import type { FileSystemTreeItemPresentationModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { ScriptResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; /** diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/workspace/script-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/workspace/script-workspace-editor.element.ts index 408a1a133f..9142f47d06 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/workspace/script-workspace-editor.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/workspace/script-workspace-editor.element.ts @@ -2,7 +2,7 @@ import type { UmbScriptWorkspaceContext } from './script-workspace.context.js'; import type { UmbCodeEditorElement } from '@umbraco-cms/backoffice/code-editor'; import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; import type { UUIInputElement } from '@umbraco-cms/backoffice/external/uui'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { UMB_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/workspace'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/workspace/script-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/workspace/script-workspace.element.ts index 41cfd09090..a5d7f5cfea 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/workspace/script-workspace.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/workspace/script-workspace.element.ts @@ -2,7 +2,7 @@ import { UmbScriptWorkspaceContext } from './script-workspace.context.js'; import { UmbScriptWorkspaceEditorElement } from './script-workspace-editor.element.js'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbRoute, IRoutingInfo, PageComponent } from '@umbraco-cms/backoffice/router'; import { UmbWorkspaceIsNewRedirectController } from '@umbraco-cms/backoffice/workspace'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/components/stylesheet-input/stylesheet-input.element.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/components/stylesheet-input/stylesheet-input.element.ts index 73699431dc..7eb3b3d9c7 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/components/stylesheet-input/stylesheet-input.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/components/stylesheet-input/stylesheet-input.element.ts @@ -2,7 +2,7 @@ import type { UmbStylesheetItemModel } from '../../types.js'; import { UmbStylesheetPickerContext } from './stylesheet-input.context.js'; import { css, html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit'; import { FormControlMixin } from '@umbraco-cms/backoffice/external/uui'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { splitStringToArray } from '@umbraco-cms/backoffice/utils'; @customElement('umb-stylesheet-input') diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/components/stylesheet-rule-input/stylesheet-rule-input.element.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/components/stylesheet-rule-input/stylesheet-rule-input.element.ts index 0312d8e6c1..af204061f7 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/components/stylesheet-rule-input/stylesheet-rule-input.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/components/stylesheet-rule-input/stylesheet-rule-input.element.ts @@ -5,7 +5,7 @@ import { css, html, customElement, repeat, property } from '@umbraco-cms/backoff import { FormControlMixin } from '@umbraco-cms/backoffice/external/uui'; import type { UmbModalManagerContext } from '@umbraco-cms/backoffice/modal'; import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; // TODO: add sorting when we have a generic sorting component/functionality for ref lists diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/entity-actions/rename/rename-stylesheet.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/entity-actions/rename/rename-stylesheet.server.data-source.ts index ee6ea14d3a..fd1425c44f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/entity-actions/rename/rename-stylesheet.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/entity-actions/rename/rename-stylesheet.server.data-source.ts @@ -3,8 +3,8 @@ import { UmbServerFilePathUniqueSerializer, appendFileExtensionIfNeeded, } from '@umbraco-cms/backoffice/server-file-system'; -import type { RenameStylesheetRequestModel} from '@umbraco-cms/backoffice/backend-api'; -import { StylesheetResource } from '@umbraco-cms/backoffice/backend-api'; +import type { RenameStylesheetRequestModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { StylesheetResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/repository/item/stylesheet-item.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/repository/item/stylesheet-item.server.data-source.ts index 41ef0b9099..115c883b73 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/repository/item/stylesheet-item.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/repository/item/stylesheet-item.server.data-source.ts @@ -4,7 +4,7 @@ import { UmbServerFilePathUniqueSerializer } from '@umbraco-cms/backoffice/serve import type { UmbItemDataSource } from '@umbraco-cms/backoffice/repository'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; -import { StylesheetResource } from '@umbraco-cms/backoffice/backend-api'; +import { StylesheetResource } from '@umbraco-cms/backoffice/external/backend-api'; /** * A data source for stylesheet items that fetches data from the server diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/repository/stylesheet-detail.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/repository/stylesheet-detail.server.data-source.ts index 64dcde4c65..2212100501 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/repository/stylesheet-detail.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/repository/stylesheet-detail.server.data-source.ts @@ -4,8 +4,11 @@ import { UmbServerFilePathUniqueSerializer, appendFileExtensionIfNeeded, } from '@umbraco-cms/backoffice/server-file-system'; -import type { CreateStylesheetRequestModel, UpdateStylesheetRequestModel } from '@umbraco-cms/backoffice/backend-api'; -import { StylesheetResource } from '@umbraco-cms/backoffice/backend-api'; +import type { + CreateStylesheetRequestModel, + UpdateStylesheetRequestModel, +} from '@umbraco-cms/backoffice/external/backend-api'; +import { StylesheetResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import type { UmbDetailDataSource } from '@umbraco-cms/backoffice/repository'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/tree/folder/stylesheet-folder.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/tree/folder/stylesheet-folder.server.data-source.ts index 26023566c8..213b8f6849 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/tree/folder/stylesheet-folder.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/tree/folder/stylesheet-folder.server.data-source.ts @@ -1,7 +1,7 @@ import { UmbServerFilePathUniqueSerializer } from '@umbraco-cms/backoffice/server-file-system'; import type { UmbCreateFolderModel, UmbFolderDataSource, UmbUpdateFolderModel } from '@umbraco-cms/backoffice/tree'; -import type { CreateStylesheetFolderRequestModel} from '@umbraco-cms/backoffice/backend-api'; -import { StylesheetResource } from '@umbraco-cms/backoffice/backend-api'; +import type { CreateStylesheetFolderRequestModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { StylesheetResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/tree/stylesheet-tree.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/tree/stylesheet-tree.server.data-source.ts index f42175c4f7..9441c8e8ec 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/tree/stylesheet-tree.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/tree/stylesheet-tree.server.data-source.ts @@ -1,8 +1,8 @@ import { UMB_STYLESHEET_ENTITY_TYPE, UMB_STYLESHEET_FOLDER_ENTITY_TYPE } from '../entity.js'; import type { UmbStylesheetTreeItemModel } from './types.js'; import { UmbServerFilePathUniqueSerializer } from '@umbraco-cms/backoffice/server-file-system'; -import type { FileSystemTreeItemPresentationModel } from '@umbraco-cms/backoffice/backend-api'; -import { StylesheetResource } from '@umbraco-cms/backoffice/backend-api'; +import type { FileSystemTreeItemPresentationModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { StylesheetResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { UmbTreeServerDataSourceBase } from '@umbraco-cms/backoffice/tree'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/workspace/stylesheet-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/workspace/stylesheet-workspace-editor.element.ts index 4dc7b39fef..ad7e644241 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/workspace/stylesheet-workspace-editor.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/workspace/stylesheet-workspace-editor.element.ts @@ -2,7 +2,7 @@ import type { UmbStylesheetWorkspaceContext } from './stylesheet-workspace.conte import type { UUIInputElement, UUIInputEvent } from '@umbraco-cms/backoffice/external/uui'; import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; import { UMB_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/workspace'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; @customElement('umb-stylesheet-workspace-editor') diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/workspace/stylesheet-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/workspace/stylesheet-workspace.element.ts index a9bcd4da78..198b11c148 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/workspace/stylesheet-workspace.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/workspace/stylesheet-workspace.element.ts @@ -3,7 +3,7 @@ import { UmbStylesheetWorkspaceEditorElement } from './stylesheet-workspace-edit import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; import type { IRoutingInfo, PageComponent, UmbRoute } from '@umbraco-cms/backoffice/router'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { UmbWorkspaceIsNewRedirectController } from '@umbraco-cms/backoffice/workspace'; @customElement('umb-stylesheet-workspace') diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/workspace/views/code-editor/stylesheet-code-editor-workspace-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/workspace/views/code-editor/stylesheet-code-editor-workspace-view.element.ts index d840c96834..44a924a475 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/workspace/views/code-editor/stylesheet-code-editor-workspace-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/workspace/views/code-editor/stylesheet-code-editor-workspace-view.element.ts @@ -1,7 +1,7 @@ import type { UmbStylesheetWorkspaceContext } from '../../stylesheet-workspace.context.js'; import { UMB_STYLESHEET_WORKSPACE_CONTEXT } from '../../stylesheet-workspace.context.js'; import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbCodeEditorElement } from '@umbraco-cms/backoffice/code-editor'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/workspace/views/rich-text-rule/stylesheet-rich-text-rule-workspace-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/workspace/views/rich-text-rule/stylesheet-rich-text-rule-workspace-view.element.ts index dfc49b5b17..f55d91bf51 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/workspace/views/rich-text-rule/stylesheet-rich-text-rule-workspace-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/workspace/views/rich-text-rule/stylesheet-rich-text-rule-workspace-view.element.ts @@ -3,7 +3,7 @@ import type { UmbStylesheetRule } from '../../../types.js'; import type { UmbStylesheetRuleInputElement } from '../../../components/index.js'; import { UmbStylesheetRuleManager } from '../../../utils/index.js'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { UMB_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/workspace'; import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; import type { UmbChangeEvent } from '@umbraco-cms/backoffice/event'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/components/input-template/input-template.element.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/components/input-template/input-template.element.ts index 142530a344..aabef26f3d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/components/input-template/input-template.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/components/input-template/input-template.element.ts @@ -6,7 +6,8 @@ import { css, html, customElement, property, state } from '@umbraco-cms/backoffi import { FormControlMixin } from '@umbraco-cms/backoffice/external/uui'; import type { UmbModalManagerContext } from '@umbraco-cms/backoffice/modal'; import { UMB_TEMPLATE_PICKER_MODAL, UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; +import { UmbChangeEvent } from '@umbraco-cms/backoffice/event'; @customElement('umb-input-template') export class UmbInputTemplateElement extends FormControlMixin(UmbLitElement) { @@ -26,7 +27,7 @@ export class UmbInputTemplateElement extends FormControlMixin(UmbLitElement) { * @default */ @property({ type: String, attribute: 'min-message' }) - minMessage = 'This field need more items'; + minMessage = 'This field needs more items'; /** * This is a maximum amount of selected items in this input. @@ -64,7 +65,6 @@ export class UmbInputTemplateElement extends FormControlMixin(UmbLitElement) { public set defaultUnique(newId: string) { this._defaultUnique = newId; super.value = newId; - this.#observePickedTemplates(); } private _modalContext?: UmbModalManagerContext; @@ -97,30 +97,43 @@ export class UmbInputTemplateElement extends FormControlMixin(UmbLitElement) { return this; } + #appendTemplates(unique: string[]) { + this.selectedIds = [...(this.selectedIds ?? []), ...unique]; + + // If there is no default, set the first picked template as default. + if (!this.defaultUnique && this.selectedIds.length) { + this.defaultUnique = this.selectedIds[0]; + } + + this.dispatchEvent(new UmbChangeEvent()); + } + #onCardChange(e: CustomEvent) { e.stopPropagation(); const unique = (e.target as UmbTemplateCardElement).value as string; this.defaultUnique = unique; - this.dispatchEvent(new CustomEvent('change')); + this.dispatchEvent(new UmbChangeEvent()); } - #openPicker() { - // TODO: Change experience, so its not multi selectable. But instead already picked templates should be unpickable. (awaiting general picker features for such) + async #openPicker() { const modalContext = this._modalContext?.open(UMB_TEMPLATE_PICKER_MODAL, { data: { + hideTreeRoot: true, multiple: true, - pickableFilter: (template) => template.unique !== null, - }, - value: { - selection: [...this._selectedIds], + pickableFilter: (template) => template.unique !== null && !this._selectedIds.includes(template.unique), }, }); - modalContext?.onSubmit().then((value) => { - if (!value?.selection) return; - this.selectedIds = value.selection.filter((x) => x !== null) as Array; - this.dispatchEvent(new CustomEvent('change')); - }); + const value = await modalContext?.onSubmit().catch(() => undefined); + + if (!value?.selection) return; + + const selectedIds = value.selection.filter((x) => x !== null) as Array; + + if (!selectedIds.length) return; + + // Add templates to row of picked templates and dispatch change event + this.#appendTemplates(selectedIds); } #removeTemplate(unique: string) { @@ -134,6 +147,17 @@ export class UmbInputTemplateElement extends FormControlMixin(UmbLitElement) { BTW. its weird cause the damage of removing the default template is equally bad when there is one or more templates. */ this.selectedIds = this._selectedIds.filter((x) => x !== unique); + + // If the default template is removed, set the first picked template as default or reset defaultUnique. + if (unique === this.defaultUnique) { + if (this.selectedIds.length) { + this.defaultUnique = this.selectedIds[0]; + } else { + this.defaultUnique = ''; + } + } + + this.dispatchEvent(new UmbChangeEvent()); } #openTemplate(e: CustomEvent) { @@ -152,7 +176,7 @@ export class UmbInputTemplateElement extends FormControlMixin(UmbLitElement) { ?default="${template.unique === this.defaultUnique}"> @@ -160,7 +184,11 @@ export class UmbInputTemplateElement extends FormControlMixin(UmbLitElement) { `, )} - Add + `; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/components/template-card/template-card.element.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/components/template-card/template-card.element.ts index f3ac10e422..cc4a841859 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/components/template-card/template-card.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/components/template-card/template-card.element.ts @@ -1,6 +1,6 @@ import { css, html, customElement, property } from '@umbraco-cms/backoffice/external/lit'; import { FormControlMixin } from '@umbraco-cms/backoffice/external/uui'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; /** * @element umb-template-card @@ -50,8 +50,12 @@ export class UmbTemplateCardElement extends FormControlMixin(UmbLitElement) { ${this.name.length ? this.name : 'Untitled template'} - - ${this.default ? '(Default template)' : 'Make default'} + + (${this.localize.term(this.default ? 'settings_defaulttemplate' : 'grid_setAsDefault')})
`; diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/modals/query-builder/query-builder-filter.element.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/modals/query-builder/query-builder-filter.element.ts index 08b1e5a7d9..f97e6dc5f9 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/modals/query-builder/query-builder-filter.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/modals/query-builder/query-builder-filter.element.ts @@ -2,13 +2,13 @@ import { localizeOperators, localizePropertyType } from './utils.js'; import type { UUIComboboxListElement } from '@umbraco-cms/backoffice/external/uui'; import type { PropertyValueMap } from '@umbraco-cms/backoffice/external/lit'; import { css, html, customElement, property, state, ifDefined } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { OperatorModel, TemplateQueryExecuteFilterPresentationModel, TemplateQuerySettingsResponseModel, -} from '@umbraco-cms/backoffice/backend-api'; -import { TemplateQueryPropertyTypeModel } from '@umbraco-cms/backoffice/backend-api'; +} from '@umbraco-cms/backoffice/external/backend-api'; +import { TemplateQueryPropertyTypeModel } from '@umbraco-cms/backoffice/external/backend-api'; @customElement('umb-template-query-builder-filter') export class UmbTemplateQueryBuilderFilterElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/modals/query-builder/query-builder-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/modals/query-builder/query-builder-modal.element.ts index 3385b7a031..b962240368 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/modals/query-builder/query-builder-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/modals/query-builder/query-builder-modal.element.ts @@ -17,7 +17,7 @@ import { import type { TemplateQueryResultResponseModel, TemplateQuerySettingsResponseModel, -} from '@umbraco-cms/backoffice/backend-api'; +} from '@umbraco-cms/backoffice/external/backend-api'; import { UmbDocumentItemRepository } from '@umbraco-cms/backoffice/document'; import './query-builder-filter.element.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/modals/query-builder/utils.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/modals/query-builder/utils.ts index 78622b7be0..37c082a0f3 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/modals/query-builder/utils.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/modals/query-builder/utils.ts @@ -1,12 +1,13 @@ import type { TemplateQueryExecuteSortModel, TemplateQueryOperatorModel, - TemplateQueryPropertyPresentationModel} from '@umbraco-cms/backoffice/backend-api'; + TemplateQueryPropertyPresentationModel, +} from '@umbraco-cms/backoffice/external/backend-api'; import { OperatorModel, TemplateQueryPropertyTypeModel, UserOrderModel, -} from '@umbraco-cms/backoffice/backend-api'; +} from '@umbraco-cms/backoffice/external/backend-api'; type TemplateOperatorModel = TemplateQueryOperatorModel & { localizeKey?: string }; type TemplatePropertyModel = TemplateQueryPropertyPresentationModel & { localizeKey?: string }; diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/repository/detail/template-detail.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/repository/detail/template-detail.server.data-source.ts index e58dbc50c6..0c300d6c53 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/repository/detail/template-detail.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/repository/detail/template-detail.server.data-source.ts @@ -2,8 +2,11 @@ import type { UmbTemplateDetailModel } from '../../types.js'; import { UMB_TEMPLATE_ENTITY_TYPE } from '../../entity.js'; import { UmbId } from '@umbraco-cms/backoffice/id'; import type { UmbDetailDataSource } from '@umbraco-cms/backoffice/repository'; -import type { CreateTemplateRequestModel, UpdateTemplateRequestModel } from '@umbraco-cms/backoffice/backend-api'; -import { TemplateResource } from '@umbraco-cms/backoffice/backend-api'; +import type { + CreateTemplateRequestModel, + UpdateTemplateRequestModel, +} from '@umbraco-cms/backoffice/external/backend-api'; +import { TemplateResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/repository/item/template-item.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/repository/item/template-item.server.data-source.ts index 6e1ae7bc5f..acebcf4f7a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/repository/item/template-item.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/repository/item/template-item.server.data-source.ts @@ -1,7 +1,7 @@ import type { UmbTemplateItemModel } from './types.js'; import { UmbItemServerDataSourceBase } from '@umbraco-cms/backoffice/repository'; -import type { TemplateItemResponseModel } from '@umbraco-cms/backoffice/backend-api'; -import { TemplateResource } from '@umbraco-cms/backoffice/backend-api'; +import type { TemplateItemResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { TemplateResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; /** diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/repository/query/template-query.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/repository/query/template-query.server.data-source.ts index 7ddd63126d..84dbbe7b75 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/repository/query/template-query.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/repository/query/template-query.server.data-source.ts @@ -1,6 +1,6 @@ import type { UmbExecuteTemplateQueryRequestModel } from './types.js'; -import type { TemplateQueryExecuteModel } from '@umbraco-cms/backoffice/backend-api'; -import { TemplateResource } from '@umbraco-cms/backoffice/backend-api'; +import type { TemplateQueryExecuteModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { TemplateResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/repository/query/types.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/repository/query/types.ts index 0294f38b8f..1bdad9793f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/repository/query/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/repository/query/types.ts @@ -1,7 +1,7 @@ import type { TemplateQueryExecuteFilterPresentationModel, TemplateQueryExecuteSortModel, -} from '@umbraco-cms/backoffice/backend-api'; +} from '@umbraco-cms/backoffice/external/backend-api'; export interface UmbExecuteTemplateQueryRequestModel { rootDocument: { unique: string } | null; diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/tree/template-tree.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/tree/template-tree.server.data-source.ts index c97e37e255..4899e40171 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/tree/template-tree.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/tree/template-tree.server.data-source.ts @@ -1,8 +1,8 @@ import { UMB_TEMPLATE_ENTITY_TYPE } from '../entity.js'; import type { UmbTemplateTreeItemModel } from './types.js'; import { UmbTreeServerDataSourceBase } from '@umbraco-cms/backoffice/tree'; -import type { NamedEntityTreeItemResponseModel } from '@umbraco-cms/backoffice/backend-api'; -import { TemplateResource } from '@umbraco-cms/backoffice/backend-api'; +import type { NamedEntityTreeItemResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { TemplateResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; /** diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/template-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/template-workspace-editor.element.ts index ca3c6240e5..8903dadab5 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/template-workspace-editor.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/template-workspace-editor.element.ts @@ -9,7 +9,7 @@ import type { UUIInputElement } from '@umbraco-cms/backoffice/external/uui'; import { css, html, customElement, query, state, nothing, ifDefined } from '@umbraco-cms/backoffice/external/lit'; import type { UmbModalManagerContext } from '@umbraco-cms/backoffice/modal'; import { UMB_MODAL_MANAGER_CONTEXT, UMB_TEMPLATE_PICKER_MODAL } from '@umbraco-cms/backoffice/modal'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { Subject, debounceTime } from '@umbraco-cms/backoffice/external/rxjs'; @customElement('umb-template-workspace-editor') diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/template-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/template-workspace.element.ts index 87e071ccf2..d4a7ed94d4 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/template-workspace.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/template-workspace.element.ts @@ -2,7 +2,7 @@ import { UmbTemplateWorkspaceContext } from './template-workspace.context.js'; import { UmbTemplateWorkspaceEditorElement } from './template-workspace-editor.element.js'; import { html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; import type { IRoutingInfo, PageComponent, UmbRoute } from '@umbraco-cms/backoffice/router'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import '../../components/insert-menu/templating-insert-menu.element.js'; import { UmbWorkspaceIsNewRedirectController } from '@umbraco-cms/backoffice/workspace'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/umbraco-news/umbraco-news-dashboard.element.ts b/src/Umbraco.Web.UI.Client/src/packages/umbraco-news/umbraco-news-dashboard.element.ts index 4fdc4420ba..e22db293ed 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/umbraco-news/umbraco-news-dashboard.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/umbraco-news/umbraco-news-dashboard.element.ts @@ -1,7 +1,7 @@ import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { UMB_CURRENT_USER_CONTEXT } from '@umbraco-cms/backoffice/current-user'; import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-umbraco-news-dashboard') export class UmbUmbracoNewsDashboardElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/current-user-header-app.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/current-user-header-app.element.ts index bf8b577f92..2dee14ca6d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/current-user-header-app.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/current-user-header-app.element.ts @@ -4,7 +4,7 @@ import type { CSSResultGroup } from '@umbraco-cms/backoffice/external/lit'; import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; import type { UmbModalManagerContext } from '@umbraco-cms/backoffice/modal'; import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { UMB_CURRENT_USER_CONTEXT, type UmbCurrentUserModel } from '@umbraco-cms/backoffice/current-user'; @customElement('umb-current-user-header-app') diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/modals/current-user/current-user-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/modals/current-user/current-user-modal.element.ts index 4cc299d121..9ad8bd483b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/modals/current-user/current-user-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/modals/current-user/current-user-modal.element.ts @@ -6,7 +6,7 @@ import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import type { CSSResultGroup } from '@umbraco-cms/backoffice/external/lit'; import { css, html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit'; import type { UmbModalContext } from '@umbraco-cms/backoffice/modal'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-current-user-modal') export class UmbCurrentUserModalElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/repository/current-user.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/repository/current-user.server.data-source.ts index 9613df7ffd..5038b01a3e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/repository/current-user.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/repository/current-user.server.data-source.ts @@ -1,5 +1,5 @@ import type { UmbCurrentUserModel } from '../types.js'; -import { UserResource } from '@umbraco-cms/backoffice/backend-api'; +import { UserResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/user-profile-apps/user-profile-app-external-login-providers.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/user-profile-apps/user-profile-app-external-login-providers.element.ts index 7ba6dec9cb..1412866a8a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/user-profile-apps/user-profile-app-external-login-providers.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/user-profile-apps/user-profile-app-external-login-providers.element.ts @@ -1,6 +1,6 @@ import { css, html, customElement } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-user-profile-app-external-login-providers') export class UmbUserProfileAppExternalLoginProvidersElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/user-profile-apps/user-profile-app-history.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/user-profile-apps/user-profile-app-history.element.ts index 041c5eba84..bc58fe7156 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/user-profile-apps/user-profile-app-history.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/user-profile-apps/user-profile-app-history.element.ts @@ -1,12 +1,8 @@ -import type { - UmbCurrentUserHistoryItem, - UmbCurrentUserHistoryStore} from '../current-user-history.store.js'; -import { - UMB_CURRENT_USER_HISTORY_STORE_CONTEXT, -} from '../current-user-history.store.js'; +import type { UmbCurrentUserHistoryItem, UmbCurrentUserHistoryStore } from '../current-user-history.store.js'; +import { UMB_CURRENT_USER_HISTORY_STORE_CONTEXT } from '../current-user-history.store.js'; import { css, html, nothing, customElement, state } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-user-profile-app-history') export class UmbUserProfileAppHistoryElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/user-profile-apps/user-profile-app-profile.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/user-profile-apps/user-profile-app-profile.element.ts index b182f9a4a0..d314ef0f26 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/user-profile-apps/user-profile-app-profile.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/user-profile-apps/user-profile-app-profile.element.ts @@ -1,6 +1,6 @@ import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbModalManagerContext } from '@umbraco-cms/backoffice/modal'; import { UMB_CHANGE_PASSWORD_MODAL, UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal'; import { UMB_CURRENT_USER_CONTEXT, type UmbCurrentUserModel } from '@umbraco-cms/backoffice/current-user'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/user-profile-apps/user-profile-app-themes.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/user-profile-apps/user-profile-app-themes.element.ts index f38d8a247f..56c556d1ff 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/user-profile-apps/user-profile-app-themes.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/user-profile-apps/user-profile-app-themes.element.ts @@ -2,7 +2,7 @@ import type { UmbThemeContext } from '@umbraco-cms/backoffice/themes'; import { UMB_THEME_CONTEXT } from '@umbraco-cms/backoffice/themes'; import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; import type { UUISelectEvent } from '@umbraco-cms/backoffice/external/uui'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { ManifestTheme } from '@umbraco-cms/backoffice/extension-registry'; import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/components/user-group-table-sections-column-layout.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/components/user-group-table-sections-column-layout.element.ts index d39ed9f6c0..684c9d266d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/components/user-group-table-sections-column-layout.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/components/user-group-table-sections-column-layout.element.ts @@ -1,7 +1,7 @@ import { html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit'; import type { UmbTableItem } from '@umbraco-cms/backoffice/components'; import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-user-group-table-sections-column-layout') export class UmbUserGroupTableSectionsColumnLayoutElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/repository/user-group-collection.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/repository/user-group-collection.server.data-source.ts index 45e9c05bc5..fef062fbe2 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/repository/user-group-collection.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/repository/user-group-collection.server.data-source.ts @@ -1,10 +1,10 @@ +import { UserGroupResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbUserGroupCollectionFilterModel } from '../types.js'; import type { UmbUserGroupDetailModel } from '../../types.js'; import { UMB_USER_GROUP_ENTITY_TYPE } from '../../entity.js'; import type { UmbCollectionDataSource } from '@umbraco-cms/backoffice/repository'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; -import { UserGroupResource } from '@umbraco-cms/backoffice/backend-api'; /** * A data source for the UserGroup that fetches data from the server diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/views/user-group-table-collection-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/views/user-group-table-collection-view.element.ts index 258336b1f9..ff5eb2497b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/views/user-group-table-collection-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/views/user-group-table-collection-view.element.ts @@ -1,6 +1,6 @@ import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbDefaultCollectionContext } from '@umbraco-cms/backoffice/collection'; import { UMB_DEFAULT_COLLECTION_CONTEXT } from '@umbraco-cms/backoffice/collection'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/components/input-user-group/user-group-input.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/components/input-user-group/user-group-input.element.ts index a1de70fc2c..90135464d7 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/components/input-user-group/user-group-input.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/components/input-user-group/user-group-input.element.ts @@ -2,7 +2,7 @@ import type { UmbUserGroupItemModel } from '../../repository/index.js'; import { UmbUserGroupPickerContext } from './user-group-input.context.js'; import { css, html, customElement, property, state, ifDefined, nothing } from '@umbraco-cms/backoffice/external/lit'; import { FormControlMixin } from '@umbraco-cms/backoffice/external/uui'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { splitStringToArray } from '@umbraco-cms/backoffice/utils'; @customElement('umb-user-group-input') diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/detail/user-group-detail.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/detail/user-group-detail.server.data-source.ts index a4646273c0..6a085e3a2f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/detail/user-group-detail.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/detail/user-group-detail.server.data-source.ts @@ -1,9 +1,12 @@ +import type { + CreateUserGroupRequestModel, + UpdateUserGroupRequestModel, +} from '@umbraco-cms/backoffice/external/backend-api'; +import { UserGroupResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbUserGroupDetailModel } from '../../types.js'; import { UMB_USER_GROUP_ENTITY_TYPE } from '../../entity.js'; import { UmbId } from '@umbraco-cms/backoffice/id'; import type { UmbDetailDataSource } from '@umbraco-cms/backoffice/repository'; -import type { CreateUserGroupRequestModel, UpdateUserGroupRequestModel } from '@umbraco-cms/backoffice/backend-api'; -import { UserGroupResource } from '@umbraco-cms/backoffice/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/item/user-group-item.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/item/user-group-item.server.data-source.ts index 1dc31d60df..fe739f5171 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/item/user-group-item.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/repository/item/user-group-item.server.data-source.ts @@ -1,7 +1,7 @@ +import type { UserGroupItemResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { UserGroupResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbUserGroupItemModel } from './types.js'; import { UmbItemServerDataSourceBase } from '@umbraco-cms/backoffice/repository'; -import type { UserGroupItemResponseModel } from '@umbraco-cms/backoffice/backend-api'; -import { UserGroupResource } from '@umbraco-cms/backoffice/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; /** diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/section-view/user-group-section-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/section-view/user-group-section-view.element.ts index 887f736aad..8182e10822 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/section-view/user-group-section-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/section-view/user-group-section-view.element.ts @@ -1,7 +1,7 @@ import { UMB_USER_GROUP_COLLECTION_ALIAS } from '../collection/index.js'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { css, html, customElement } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbRoute } from '@umbraco-cms/backoffice/router'; @customElement('umb-user-group-section-view') diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/actions/workspace-action-user-group-save.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/actions/workspace-action-user-group-save.element.ts index a973312255..bd7eec6fe7 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/actions/workspace-action-user-group-save.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/actions/workspace-action-user-group-save.element.ts @@ -2,7 +2,7 @@ import { UMB_USER_WORKSPACE_CONTEXT } from '../../../user/workspace/user-workspa import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import type { UUIButtonState } from '@umbraco-cms/backoffice/external/uui'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-workspace-action-user-group-save') export class UmbWorkspaceActionUserGroupSaveElement extends UmbLitElement { @state() diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/components/user-group-default-permission-list.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/components/user-group-default-permission-list.element.ts index 53643bcfc4..3c89528ec5 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/components/user-group-default-permission-list.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/components/user-group-default-permission-list.element.ts @@ -1,6 +1,6 @@ import { UMB_USER_GROUP_WORKSPACE_CONTEXT } from '../user-group-workspace.context.js'; import { html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import type { UmbSelectionChangeEvent } from '@umbraco-cms/backoffice/event'; import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/components/user-group-granular-permission-list.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/components/user-group-granular-permission-list.element.ts index edfd2ea396..83170394d6 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/components/user-group-granular-permission-list.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/components/user-group-granular-permission-list.element.ts @@ -1,7 +1,7 @@ import { UMB_USER_GROUP_WORKSPACE_CONTEXT } from '../user-group-workspace.context.js'; import type { UmbUserGroupDetailModel } from '../../types.js'; import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; @customElement('umb-user-group-granular-permission-list') diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group-workspace-editor.element.ts index ae5b871b56..e6dd436e2f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group-workspace-editor.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group-workspace-editor.element.ts @@ -5,7 +5,7 @@ import type { UmbUserInputElement } from '@umbraco-cms/backoffice/user'; import type { UUIInputElement } from '@umbraco-cms/backoffice/external/uui'; import { UUIInputEvent } from '@umbraco-cms/backoffice/external/uui'; import { css, html, nothing, customElement, state } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import type { UmbInputDocumentElement } from '@umbraco-cms/backoffice/document'; import type { UmbInputSectionElement } from '@umbraco-cms/backoffice/components'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group-workspace.element.ts index c4bd3fa80e..9a31739030 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group-workspace.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group-workspace.element.ts @@ -2,7 +2,7 @@ import { UmbUserGroupWorkspaceContext } from './user-group-workspace.context.js' import { UmbUserGroupWorkspaceEditorElement } from './user-group-workspace-editor.element.js'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbRoute } from '@umbraco-cms/backoffice/router'; import { UmbWorkspaceIsNewRedirectController } from '@umbraco-cms/backoffice/workspace'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-permission/components/entity-user-permission-settings-list/entity-user-permission-settings-list.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-permission/components/entity-user-permission-settings-list/entity-user-permission-settings-list.element.ts index fcf0879a5f..3736f28c5f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-permission/components/entity-user-permission-settings-list/entity-user-permission-settings-list.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-permission/components/entity-user-permission-settings-list/entity-user-permission-settings-list.element.ts @@ -5,7 +5,7 @@ import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registr import { css, html, customElement, property, state, nothing, ifDefined } from '@umbraco-cms/backoffice/external/lit'; import type { UmbObserverController } from '@umbraco-cms/backoffice/observable-api'; import type { UmbUserPermissionSettingElement } from '@umbraco-cms/backoffice/user'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-entity-user-permission-settings-list') export class UmbEntityUserPermissionSettingsListElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/index.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/index.ts new file mode 100644 index 0000000000..3d76f338dd --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/index.ts @@ -0,0 +1 @@ +export * from './repository/index.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/repository/user-collection.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/repository/user-collection.server.data-source.ts index 9f654ee9ae..cd1a111ca7 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/repository/user-collection.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/repository/user-collection.server.data-source.ts @@ -2,8 +2,8 @@ import type { UmbUserDetailModel } from '../../types.js'; import { UMB_USER_ENTITY_TYPE } from '../../entity.js'; import type { UmbUserCollectionFilterModel } from '../types.js'; import type { UmbCollectionDataSource } from '@umbraco-cms/backoffice/repository'; -import type { UserResponseModel } from '@umbraco-cms/backoffice/backend-api'; -import { UserResource } from '@umbraco-cms/backoffice/backend-api'; +import type { UserResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { UserResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/types.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/types.ts index d86f05a32e..6e4474e67c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/types.ts @@ -1,4 +1,4 @@ -import type { DirectionModel, UserOrderModel, UserStateModel } from '@umbraco-cms/backoffice/backend-api'; +import type { DirectionModel, UserOrderModel, UserStateModel } from '@umbraco-cms/backoffice/external/backend-api'; export interface UmbUserCollectionFilterModel { skip?: number; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/user-collection-header.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/user-collection-header.element.ts index 123ae1201e..70515da920 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/user-collection-header.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/user-collection-header.element.ts @@ -6,11 +6,11 @@ import type { UUIRadioGroupEvent, } from '@umbraco-cms/backoffice/external/uui'; import { css, html, customElement, state, repeat, ifDefined } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { UMB_DEFAULT_COLLECTION_CONTEXT } from '@umbraco-cms/backoffice/collection'; import type { UmbModalManagerContext } from '@umbraco-cms/backoffice/modal'; -import type { UserOrderModel } from '@umbraco-cms/backoffice/backend-api'; -import { UserStateModel } from '@umbraco-cms/backoffice/backend-api'; +import type { UserOrderModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { UserStateModel } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbUserGroupDetailModel } from '@umbraco-cms/backoffice/user-group'; import { UmbUserGroupCollectionRepository } from '@umbraco-cms/backoffice/user-group'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/user-collection.context.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/user-collection.context.ts index bd3377f588..556709d9c2 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/user-collection.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/user-collection.context.ts @@ -2,7 +2,7 @@ import type { UmbUserDetailModel } from '../types.js'; import { UMB_COLLECTION_VIEW_USER_GRID } from './views/index.js'; import type { UmbUserCollectionFilterModel } from './types.js'; import { UmbDefaultCollectionContext } from '@umbraco-cms/backoffice/collection'; -import type { UserOrderModel, UserStateModel } from '@umbraco-cms/backoffice/backend-api'; +import type { UserOrderModel, UserStateModel } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api'; export class UmbUserCollectionContext extends UmbDefaultCollectionContext< diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/views/grid/user-grid-collection-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/views/grid/user-grid-collection-view.element.ts index 69447aab3e..1289e53543 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/views/grid/user-grid-collection-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/views/grid/user-grid-collection-view.element.ts @@ -4,8 +4,8 @@ import type { UmbUserDetailModel } from '../../../types.js'; import { css, html, nothing, customElement, state, repeat, ifDefined } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { UMB_DEFAULT_COLLECTION_CONTEXT } from '@umbraco-cms/backoffice/collection'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; -import { UserStateModel } from '@umbraco-cms/backoffice/backend-api'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; +import { UserStateModel } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbUserGroupDetailModel } from '@umbraco-cms/backoffice/user-group'; import { UmbUserGroupCollectionRepository } from '@umbraco-cms/backoffice/user-group'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/views/table/user-table-collection-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/views/table/user-table-collection-view.element.ts index 76344d6a62..6cb43059d4 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/views/table/user-table-collection-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/views/table/user-table-collection-view.element.ts @@ -12,7 +12,7 @@ import type { UmbTableOrderedEvent, } from '@umbraco-cms/backoffice/components'; import { UMB_DEFAULT_COLLECTION_CONTEXT } from '@umbraco-cms/backoffice/collection'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbUserGroupItemModel } from '@umbraco-cms/backoffice/user-group'; import { UmbUserGroupItemRepository } from '@umbraco-cms/backoffice/user-group'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/components/user-document-start-node/user-document-start-node.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/components/user-document-start-node/user-document-start-node.element.ts index 9916243141..f8ec3c7077 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/components/user-document-start-node/user-document-start-node.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/components/user-document-start-node/user-document-start-node.element.ts @@ -1,5 +1,5 @@ import { css, html, customElement, property, repeat, state } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import type { UmbDocumentItemModel } from '@umbraco-cms/backoffice/document'; import { UmbDocumentItemRepository } from '@umbraco-cms/backoffice/document'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/components/user-input/user-input.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/components/user-input/user-input.element.ts index 3bff6c37cb..0280e78f3d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/components/user-input/user-input.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/components/user-input/user-input.element.ts @@ -2,7 +2,7 @@ import type { UmbUserItemModel } from '../../repository/index.js'; import { UmbUserPickerContext } from './user-input.context.js'; import { css, html, customElement, property, state, ifDefined } from '@umbraco-cms/backoffice/external/lit'; import { FormControlMixin } from '@umbraco-cms/backoffice/external/uui'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { splitStringToArray } from '@umbraco-cms/backoffice/utils'; @customElement('umb-user-input') diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/components/user-media-start-node/user-media-start-node.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/components/user-media-start-node/user-media-start-node.element.ts index bf74902080..5d213e9186 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/components/user-media-start-node/user-media-start-node.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/components/user-media-start-node/user-media-start-node.element.ts @@ -1,5 +1,5 @@ import { css, html, customElement, property, repeat, state, ifDefined } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import type { UmbMediaItemModel } from '@umbraco-cms/backoffice/media'; import { UmbMediaItemRepository } from '@umbraco-cms/backoffice/media'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/components/user-permission-setting/user-permission-setting.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/components/user-permission-setting/user-permission-setting.element.ts index 4392d31fbd..01c173edbc 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/components/user-permission-setting/user-permission-setting.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/components/user-permission-setting/user-permission-setting.element.ts @@ -1,6 +1,6 @@ import type { UUIBooleanInputEvent } from '@umbraco-cms/backoffice/external/uui'; import { css, html, customElement, property } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { UmbChangeEvent } from '@umbraco-cms/backoffice/event'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/user-allow-disable-action.condition.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/user-allow-disable-action.condition.ts index 9a8850c63e..358b0ab2d3 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/user-allow-disable-action.condition.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/user-allow-disable-action.condition.ts @@ -1,5 +1,5 @@ import { UmbUserActionConditionBase } from './user-allow-action-base.condition.js'; -import { UserStateModel } from '@umbraco-cms/backoffice/backend-api'; +import { UserStateModel } from '@umbraco-cms/backoffice/external/backend-api'; import type { ManifestCondition, UmbConditionConfigBase, diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/user-allow-enable-action.condition.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/user-allow-enable-action.condition.ts index 0414148a62..00268264ca 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/user-allow-enable-action.condition.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/user-allow-enable-action.condition.ts @@ -1,5 +1,5 @@ import { UmbUserActionConditionBase } from './user-allow-action-base.condition.js'; -import { UserStateModel } from '@umbraco-cms/backoffice/backend-api'; +import { UserStateModel } from '@umbraco-cms/backoffice/external/backend-api'; import type { ManifestCondition, UmbConditionConfigBase, diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/user-allow-unlock-action.condition.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/user-allow-unlock-action.condition.ts index 7123f4ae1c..11b481faf8 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/user-allow-unlock-action.condition.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/user-allow-unlock-action.condition.ts @@ -1,5 +1,5 @@ import { UmbUserActionConditionBase } from './user-allow-action-base.condition.js'; -import { UserStateModel } from '@umbraco-cms/backoffice/backend-api'; +import { UserStateModel } from '@umbraco-cms/backoffice/external/backend-api'; import type { ManifestCondition, UmbConditionConfigBase, diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/index.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/index.ts index 1e0f92873c..516c4d7ade 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/index.ts @@ -1,3 +1,4 @@ +export * from './collection/index.js'; export * from './components/index.js'; export * from './invite/index.js'; export * from './repository/index.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/entity-action/resend-invite/resend-invite.action.condition.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/entity-action/resend-invite/resend-invite.action.condition.ts index 32a6e517b0..73dbad59cb 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/entity-action/resend-invite/resend-invite.action.condition.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/entity-action/resend-invite/resend-invite.action.condition.ts @@ -1,5 +1,5 @@ import { UmbUserActionConditionBase } from '../../../conditions/user-allow-action-base.condition.js'; -import { UserStateModel } from '@umbraco-cms/backoffice/backend-api'; +import { UserStateModel } from '@umbraco-cms/backoffice/external/backend-api'; import type { ManifestCondition, UmbConditionConfigBase, diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/repository/invite-user-server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/repository/invite-user-server.data-source.ts index cb31607239..8f0debf574 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/repository/invite-user-server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/repository/invite-user-server.data-source.ts @@ -1,6 +1,6 @@ import { UmbUserServerDataSource } from '../../repository/detail/user-detail.server.data-source.js'; import type { UmbInviteUserDataSource, UmbInviteUserRequestModel, UmbResendUserInviteRequestModel } from './types.js'; -import { UserResource } from '@umbraco-cms/backoffice/backend-api'; +import { UserResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/avatar/user-avatar.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/avatar/user-avatar.server.data-source.ts index ae5d3c96b9..88418d929f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/avatar/user-avatar.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/avatar/user-avatar.server.data-source.ts @@ -1,5 +1,5 @@ -import type { SetAvatarRequestModel } from '@umbraco-cms/backoffice/backend-api'; -import { UserResource } from '@umbraco-cms/backoffice/backend-api'; +import type { SetAvatarRequestModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { UserResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import type { UmbDataSourceErrorResponse } from '@umbraco-cms/backoffice/repository'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/change-password/change-user-password.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/change-password/change-user-password.server.data-source.ts index 0a5a734262..fa4569e7e8 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/change-password/change-user-password.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/change-password/change-user-password.server.data-source.ts @@ -1,4 +1,4 @@ -import { UserResource } from '@umbraco-cms/backoffice/backend-api'; +import { UserResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/detail/user-detail.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/detail/user-detail.server.data-source.ts index 10d809d344..cf676c821c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/detail/user-detail.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/detail/user-detail.server.data-source.ts @@ -2,8 +2,8 @@ import type { UmbUserDetailModel } from '../../types.js'; import { UMB_USER_ENTITY_TYPE } from '../../entity.js'; import { UmbId } from '@umbraco-cms/backoffice/id'; import type { UmbDetailDataSource } from '@umbraco-cms/backoffice/repository'; -import type { CreateUserRequestModel, UpdateUserRequestModel } from '@umbraco-cms/backoffice/backend-api'; -import { UserResource } from '@umbraco-cms/backoffice/backend-api'; +import type { CreateUserRequestModel, UpdateUserRequestModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { UserResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/disable/disable-user.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/disable/disable-user.repository.ts index 95d996c37c..365159f9cb 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/disable/disable-user.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/disable/disable-user.repository.ts @@ -1,7 +1,7 @@ import { UmbUserRepositoryBase } from '../user-repository-base.js'; import { UmbDisableUserServerDataSource } from './disable-user.server.data-source.js'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; -import { UserStateModel } from '@umbraco-cms/backoffice/backend-api'; +import { UserStateModel } from '@umbraco-cms/backoffice/external/backend-api'; export class UmbDisableUserRepository extends UmbUserRepositoryBase { #disableSource: UmbDisableUserServerDataSource; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/disable/disable-user.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/disable/disable-user.server.data-source.ts index 526f16f530..5b2c0a93ea 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/disable/disable-user.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/disable/disable-user.server.data-source.ts @@ -1,5 +1,5 @@ import type { UmbDisableUserDataSource } from './types.js'; -import { UserResource } from '@umbraco-cms/backoffice/backend-api'; +import { UserResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/enable/enable-user.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/enable/enable-user.repository.ts index db6442cbe3..bf658b3ca4 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/enable/enable-user.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/enable/enable-user.repository.ts @@ -1,7 +1,7 @@ import { UmbUserRepositoryBase } from '../user-repository-base.js'; import { UmbEnableUserServerDataSource } from './enable-user.server.data-source.js'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; -import { UserStateModel } from '@umbraco-cms/backoffice/backend-api'; +import { UserStateModel } from '@umbraco-cms/backoffice/external/backend-api'; export class UmbEnableUserRepository extends UmbUserRepositoryBase { #enableSource: UmbEnableUserServerDataSource; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/enable/enable-user.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/enable/enable-user.server.data-source.ts index 823bc47dd1..fb2d1c4895 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/enable/enable-user.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/enable/enable-user.server.data-source.ts @@ -1,5 +1,5 @@ import type { UmbEnableUserDataSource } from './types.js'; -import { UserResource } from '@umbraco-cms/backoffice/backend-api'; +import { UserResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/item/user-item.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/item/user-item.server.data-source.ts index 9eb92f27b8..4b544ec35c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/item/user-item.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/item/user-item.server.data-source.ts @@ -1,7 +1,7 @@ import type { UmbUserItemModel } from './types.js'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; -import type { UserItemResponseModel } from '@umbraco-cms/backoffice/backend-api'; -import { UserResource } from '@umbraco-cms/backoffice/backend-api'; +import type { UserItemResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { UserResource } from '@umbraco-cms/backoffice/external/backend-api'; import { UmbItemServerDataSourceBase } from '@umbraco-cms/backoffice/repository'; /** diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/sources/user-set-group.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/sources/user-set-group.server.data-source.ts index b7630ab52c..f5af122ed2 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/sources/user-set-group.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/sources/user-set-group.server.data-source.ts @@ -1,4 +1,4 @@ -import { UserResource } from '@umbraco-cms/backoffice/backend-api'; +import { UserResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/unlock/unlock-user.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/unlock/unlock-user.repository.ts index b282914939..441e408fbf 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/unlock/unlock-user.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/unlock/unlock-user.repository.ts @@ -1,7 +1,7 @@ import { UmbUserRepositoryBase } from '../user-repository-base.js'; import { UmbUnlockUserServerDataSource } from './unlock-user.server.data-source.js'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; -import { UserStateModel } from '@umbraco-cms/backoffice/backend-api'; +import { UserStateModel } from '@umbraco-cms/backoffice/external/backend-api'; export class UmbUnlockUserRepository extends UmbUserRepositoryBase { #source: UmbUnlockUserServerDataSource; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/unlock/unlock-user.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/unlock/unlock-user.server.data-source.ts index ce455f1353..d490ca9d58 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/unlock/unlock-user.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/unlock/unlock-user.server.data-source.ts @@ -1,5 +1,5 @@ +import { UserResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbUnlockUserDataSource } from './types.js'; -import { UserResource } from '@umbraco-cms/backoffice/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/section-view/users-section-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/section-view/users-section-view.element.ts index 630ad63493..2de8a0a0a8 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/section-view/users-section-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/section-view/users-section-view.element.ts @@ -2,7 +2,7 @@ import { UMB_USER_COLLECTION_ALIAS } from '../collection/manifests.js'; import { css, html, customElement } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import type { UmbRoute } from '@umbraco-cms/backoffice/router'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-section-view-users') export class UmbSectionViewUsersElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/types.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/types.ts index aaff0a64a4..c447767734 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/types.ts @@ -1,5 +1,5 @@ import type { UmbUserEntityType } from './entity.js'; -import type { UserStateModel } from '@umbraco-cms/backoffice/backend-api'; +import type { UserStateModel } from '@umbraco-cms/backoffice/external/backend-api'; export interface UmbUserDetailModel { entityType: UmbUserEntityType; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/actions/user-workspace-action-save.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/actions/user-workspace-action-save.element.ts index 63d40f4c90..462d66cf41 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/actions/user-workspace-action-save.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/actions/user-workspace-action-save.element.ts @@ -2,7 +2,7 @@ import { UMB_USER_WORKSPACE_CONTEXT } from '../user-workspace.context.js'; import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import type { UUIButtonState } from '@umbraco-cms/backoffice/external/uui'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-user-workspace-action-save') export class UmbUserWorkspaceActionSaveElement extends UmbLitElement { @state() diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/components/user-workspace-access-settings/user-workspace-access-settings.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/components/user-workspace-access-settings/user-workspace-access-settings.element.ts index c8d87c45c3..d7f4a626b8 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/components/user-workspace-access-settings/user-workspace-access-settings.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/components/user-workspace-access-settings/user-workspace-access-settings.element.ts @@ -1,7 +1,7 @@ import { UMB_USER_WORKSPACE_CONTEXT } from '../../user-workspace.context.js'; import type { UmbUserDetailModel } from '../../../types.js'; import { html, customElement, state, css } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import type { UmbChangeEvent } from '@umbraco-cms/backoffice/event'; import type { UmbInputDocumentElement } from '@umbraco-cms/backoffice/document'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/components/user-workspace-info/user-workspace-info.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/components/user-workspace-info/user-workspace-info.element.ts index 190ff042c0..a994c84640 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/components/user-workspace-info/user-workspace-info.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/components/user-workspace-info/user-workspace-info.element.ts @@ -11,7 +11,7 @@ import { query, nothing, } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { UMB_APP_CONTEXT } from '@umbraco-cms/backoffice/app'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/components/user-workspace-profile-settings/user-workspace-profile-settings.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/components/user-workspace-profile-settings/user-workspace-profile-settings.element.ts index 9ee03c1d97..5a8f1547c6 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/components/user-workspace-profile-settings/user-workspace-profile-settings.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/components/user-workspace-profile-settings/user-workspace-profile-settings.element.ts @@ -1,7 +1,7 @@ import { UMB_USER_WORKSPACE_CONTEXT } from '../../user-workspace.context.js'; import type { UmbUserDetailModel } from '../../../types.js'; import { html, customElement, state, ifDefined, css } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import type { UmbChangeEvent } from '@umbraco-cms/backoffice/event'; import type { UmbUiCultureInputElement } from '@umbraco-cms/backoffice/localization'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user-workspace-editor.element.ts index c7cb265218..055020aa15 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user-workspace-editor.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user-workspace-editor.element.ts @@ -4,7 +4,7 @@ import type { UmbUserWorkspaceContext } from './user-workspace.context.js'; import type { UUIInputElement } from '@umbraco-cms/backoffice/external/uui'; import { UUIInputEvent } from '@umbraco-cms/backoffice/external/uui'; import { css, html, nothing, customElement, state } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { UMB_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/workspace'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user-workspace.element.ts index fe014b36cd..a9bd705e27 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user-workspace.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user-workspace.element.ts @@ -2,7 +2,7 @@ import { UmbUserWorkspaceContext } from './user-workspace.context.js'; import { UmbUserWorkspaceEditorElement } from './user-workspace-editor.element.js'; import { html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbRoute } from '@umbraco-cms/backoffice/router'; @customElement('umb-user-workspace') diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/utils.test.ts b/src/Umbraco.Web.UI.Client/src/packages/user/utils.test.ts index e38b8d6ae8..a6f09c70f6 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/utils.test.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/utils.test.ts @@ -1,7 +1,7 @@ import { expect } from '@open-wc/testing'; import { getDisplayStateFromUserStatus } from './utils.js'; import type { UUIInterfaceColor, UUIInterfaceLook } from '@umbraco-cms/backoffice/external/uui'; -import { UserStateModel } from '@umbraco-cms/backoffice/backend-api'; +import { UserStateModel } from '@umbraco-cms/backoffice/external/backend-api'; describe('UmbUserExtensions', () => { it('returns correct look and color from a status string', () => { diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/utils.ts b/src/Umbraco.Web.UI.Client/src/packages/user/utils.ts index e186d2361e..08a526e165 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/utils.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/utils.ts @@ -1,5 +1,5 @@ import type { UUIInterfaceColor, UUIInterfaceLook } from '@umbraco-cms/backoffice/external/uui'; -import type { UserStateModel } from '@umbraco-cms/backoffice/backend-api'; +import type { UserStateModel } from '@umbraco-cms/backoffice/external/backend-api'; interface UmbUserDisplayStatus { look: UUIInterfaceLook; diff --git a/src/Umbraco.Web.UI.Client/src/shared/auth/auth.context.ts b/src/Umbraco.Web.UI.Client/src/shared/auth/auth.context.ts index 3aa0a01836..314024084f 100644 --- a/src/Umbraco.Web.UI.Client/src/shared/auth/auth.context.ts +++ b/src/Umbraco.Web.UI.Client/src/shared/auth/auth.context.ts @@ -1,10 +1,10 @@ +import { OpenAPI } from '@umbraco-cms/backoffice/external/backend-api'; import { UmbAuthFlow } from './auth-flow.js'; import { UMB_AUTH_CONTEXT } from './auth.context.token.js'; import type { UmbOpenApiConfiguration } from './models/openApiConfiguration.js'; import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api'; import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; import { UmbBooleanState } from '@umbraco-cms/backoffice/observable-api'; -import { OpenAPI } from '@umbraco-cms/backoffice/backend-api'; export class UmbAuthContext extends UmbBaseController { #isAuthorized = new UmbBooleanState(false); diff --git a/src/Umbraco.Web.UI.Client/src/shared/resources/apiTypeValidators.function.ts b/src/Umbraco.Web.UI.Client/src/shared/resources/apiTypeValidators.function.ts index 091120886e..396d34025d 100644 --- a/src/Umbraco.Web.UI.Client/src/shared/resources/apiTypeValidators.function.ts +++ b/src/Umbraco.Web.UI.Client/src/shared/resources/apiTypeValidators.function.ts @@ -1,4 +1,4 @@ -import type { ApiError, CancelError, CancelablePromise } from '@umbraco-cms/backoffice/backend-api'; +import type { ApiError, CancelError, CancelablePromise } from '@umbraco-cms/backoffice/external/backend-api'; export function isApiError(error: unknown): error is ApiError { return (error as ApiError).name === 'ApiError'; diff --git a/src/Umbraco.Web.UI.Client/src/shared/router/router-slot.element.ts b/src/Umbraco.Web.UI.Client/src/shared/router/router-slot.element.ts index dc58988f47..50e54d418f 100644 --- a/src/Umbraco.Web.UI.Client/src/shared/router/router-slot.element.ts +++ b/src/Umbraco.Web.UI.Client/src/shared/router/router-slot.element.ts @@ -4,7 +4,7 @@ import { UmbRouterSlotChangeEvent } from './router-slot-change.event.js'; import type { UmbRoute } from './route.interface.js'; import { UmbRouteContext } from './route.context.js'; import { css, html, type PropertyValueMap, customElement, property } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { IRouterSlot } from '@umbraco-cms/backoffice/external/router-slot'; /** diff --git a/src/Umbraco.Web.UI.Client/storybook/stories/modal/story-modal-service-example.element.ts b/src/Umbraco.Web.UI.Client/storybook/stories/modal/story-modal-service-example.element.ts index c873568000..3efd7fe075 100644 --- a/src/Umbraco.Web.UI.Client/storybook/stories/modal/story-modal-service-example.element.ts +++ b/src/Umbraco.Web.UI.Client/storybook/stories/modal/story-modal-service-example.element.ts @@ -1,5 +1,5 @@ import { html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit'; -import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { UMB_MODAL_MANAGER_CONTEXT, UmbModalManagerContext } from '@umbraco-cms/backoffice/modal'; @customElement('umb-story-modal-context-example') diff --git a/src/Umbraco.Web.UI.Client/tsconfig.json b/src/Umbraco.Web.UI.Client/tsconfig.json index 94b0792104..d476898a1b 100644 --- a/src/Umbraco.Web.UI.Client/tsconfig.json +++ b/src/Umbraco.Web.UI.Client/tsconfig.json @@ -1,154 +1,240 @@ +// Don't edit this file directly. It is generated by /devops/tsconfig/index.js + { - "compilerOptions": { - "module": "esnext", - "target": "ES2020", - "lib": ["es2020", "dom", "dom.iterable"], - "outDir": "./types", - "allowSyntheticDefaultImports": true, - "experimentalDecorators": true, - "forceConsistentCasingInFileNames": true, - "useDefineForClassFields": false, - "baseUrl": ".", - "incremental": true, - "skipLibCheck": true, - - /* Bundler mode */ - "moduleResolution": "bundler", - "allowImportingTsExtensions": true, - "resolveJsonModule": true, - "isolatedModules": true, - "noEmit": true, - - /* Linting */ - "strict": true, - "noFallthroughCasesInSwitch": true, - "noImplicitReturns": true, - - "paths": { - // TODO: can we combine these of multiple tsconfigs so each package can hold their own? - // APPS - "@umbraco-cms/backoffice/app": ["src/apps/app"], - - "@umbraco-cms/backoffice/external/lit": ["src/external/lit"], - "@umbraco-cms/backoffice/external/lodash": ["src/external/lodash"], - "@umbraco-cms/backoffice/external/monaco-editor": ["src/external/monaco-editor"], - "@umbraco-cms/backoffice/external/openid": ["src/external/openid"], - "@umbraco-cms/backoffice/external/router-slot": ["src/external/router-slot"], - "@umbraco-cms/backoffice/external/rxjs": ["src/external/rxjs"], - "@umbraco-cms/backoffice/external/tinymce": ["src/external/tinymce"], - "@umbraco-cms/backoffice/external/uui": ["src/external/uui"], - "@umbraco-cms/backoffice/external/uuid": ["src/external/uuid"], - "@umbraco-cms/backoffice/external/dompurify": ["src/external/dompurify"], - "@umbraco-cms/backoffice/external/marked": ["src/external/marked"], - - "@umbraco-cms/backoffice/backend-api": ["src/external/backend-api"], - "@umbraco-cms/backoffice/class-api": ["src/libs/class-api"], - "@umbraco-cms/backoffice/context-api": ["src/libs/context-api"], - "@umbraco-cms/backoffice/controller-api": ["src/libs/controller-api"], - "@umbraco-cms/backoffice/element-api": ["src/libs/element-api"], - "@umbraco-cms/backoffice/extension-api": ["src/libs/extension-api"], - "@umbraco-cms/backoffice/localization-api": ["src/libs/localization-api"], - "@umbraco-cms/backoffice/observable-api": ["src/libs/observable-api"], - - // SHARED - "@umbraco-cms/backoffice/auth": ["src/shared/auth"], - "@umbraco-cms/backoffice/event": ["src/packages/core/event"], - "@umbraco-cms/backoffice/icon": ["src/shared/icon-registry"], - "@umbraco-cms/backoffice/models": ["src/shared/models"], - "@umbraco-cms/backoffice/resources": ["src/shared/resources"], - "@umbraco-cms/backoffice/router": ["src/shared/router"], - "@umbraco-cms/backoffice/style": ["src/shared/style"], - "@umbraco-cms/backoffice/utils": ["src/shared/utils"], - - // CORE - "@umbraco-cms/backoffice/action": ["src/packages/core/action"], - "@umbraco-cms/backoffice/collection": ["src/packages/core/collection"], - "@umbraco-cms/backoffice/components": ["src/packages/core/components"], - "@umbraco-cms/backoffice/content-type": ["src/packages/core/content-type"], - "@umbraco-cms/backoffice/debug": ["src/packages/core/debug"], - "@umbraco-cms/backoffice/entity-action": ["src/packages/core/entity-action"], - "@umbraco-cms/backoffice/entity-bulk-action": ["src/packages/core/entity-bulk-action"], - "@umbraco-cms/backoffice/extension-registry": ["src/packages/core/extension-registry"], - "@umbraco-cms/backoffice/server-file-system": ["src/packages/core/server-file-system"], - "@umbraco-cms/backoffice/id": ["src/packages/core/id"], - "@umbraco-cms/backoffice/localization": ["src/packages/core/localization"], - "@umbraco-cms/backoffice/menu": ["src/packages/core/menu"], - "@umbraco-cms/backoffice/modal": ["src/packages/core/modal"], - "@umbraco-cms/backoffice/notification": ["src/packages/core/notification"], - "@umbraco-cms/backoffice/picker-input": ["src/packages/core/picker-input"], - "@umbraco-cms/backoffice/property": ["src/packages/core/property"], - "@umbraco-cms/backoffice/property-action": ["src/packages/core/property-action"], - "@umbraco-cms/backoffice/property-editor": ["src/packages/core/property-editor"], - "@umbraco-cms/backoffice/section": ["src/packages/core/section"], - "@umbraco-cms/backoffice/sorter": ["src/packages/core/sorter"], - "@umbraco-cms/backoffice/store": ["src/packages/core/store"], - "@umbraco-cms/backoffice/themes": ["src/packages/core/themes/index.ts"], - "@umbraco-cms/backoffice/tree": ["src/packages/core/tree"], - "@umbraco-cms/backoffice/variant": ["src/packages/core/variant"], - "@umbraco-cms/backoffice/workspace": ["src/packages/core/workspace"], - "@umbraco-cms/backoffice/culture": ["src/packages/core/culture"], - "@umbraco-cms/backoffice/repository": ["src/packages/core/repository"], - "@umbraco-cms/backoffice/temporary-file": ["src/packages/core/temporary-file"], - - "@umbraco-cms/backoffice/data-type": ["./src/packages/core/data-type/index.ts"], - "@umbraco-cms/backoffice/language": ["src/packages/language/index.ts"], - "@umbraco-cms/backoffice/dynamic-root": ["./src/packages/dynamic-root/index.ts"], - "@umbraco-cms/backoffice/logviewer": ["src/packages/log-viewer/index.ts"], - "@umbraco-cms/backoffice/relation-types": ["src/packages/relations/relation-types/index.ts"], - "@umbraco-cms/backoffice/relations": ["src/packages/relations/relations/index.ts"], - "@umbraco-cms/backoffice/tags": ["./src/packages/tags/index.ts"], - "@umbraco-cms/backoffice/static-file": ["./src/packages/static-file/index.ts"], - - "@umbraco-cms/backoffice/block": ["./src/packages/block/index.ts"], - "@umbraco-cms/backoffice/audit-log": ["src/packages/audit-log/index.ts"], - "@umbraco-cms/backoffice/dictionary": ["src/packages/dictionary/index.ts"], - - // DOCUMENT MANAGEMENT - "@umbraco-cms/backoffice/document": ["./src/packages/documents/documents/index.ts"], - "@umbraco-cms/backoffice/document-blueprint": ["./src/packages/documents/document-blueprints/index.ts"], - "@umbraco-cms/backoffice/document-type": ["./src/packages/documents/document-types/index.ts"], - - // MEDIA MANAGEMENT - "@umbraco-cms/backoffice/media": ["./src/packages/media/media/index.ts"], - "@umbraco-cms/backoffice/media-type": ["./src/packages/media/media-types/index.ts"], - - // MEMBER MANAGEMENT - "@umbraco-cms/backoffice/member": ["./src/packages/members/members/index.ts"], - "@umbraco-cms/backoffice/member-group": ["./src/packages/members/member-groups/index.ts"], - "@umbraco-cms/backoffice/member-type": ["./src/packages/members/member-types/index.ts"], - - // PACKAGE MANAGEMENT - "@umbraco-cms/backoffice/package": ["./src/packages/packages/package/index.ts"], - - // USER MANAGEMENT - "@umbraco-cms/backoffice/user-group": ["src/packages/user/user-group"], - "@umbraco-cms/backoffice/current-user": ["src/packages/user/current-user"], - "@umbraco-cms/backoffice/user": ["src/packages/user/user"], - "@umbraco-cms/backoffice/user-permission": ["src/packages/user/user-permission"], - - // TEMPLATING - "@umbraco-cms/backoffice/code-editor": ["src/packages/templating/code-editor"], - "@umbraco-cms/backoffice/partial-view": ["./src/packages/templating/partial-views/index.ts"], - "@umbraco-cms/backoffice/stylesheet": ["./src/packages/templating/stylesheets/index.ts"], - "@umbraco-cms/backoffice/template": ["./src/packages/templating/templates/index.ts"], - - "@umbraco-cms/backoffice/css": ["src/shared/css/custom-properties.css"], - - "@umbraco-cms/internal/lit-element": ["src/shared/lit-element"], - "@umbraco-cms/internal/test-utils": ["utils/test-utils.ts"] - } - }, - "include": [ - "src/**/*.ts", - "apps/**/*.ts", - "e2e/**/*.ts", - "index.ts", - "storybook/stories/**/*.ts", - "examples/**/*.ts" - ], - "references": [ - { - "path": "./tsconfig.node.json" - } - ] + "compilerOptions": { + "module": "esnext", + "target": "ES2020", + "lib": ["es2020", "dom", "dom.iterable"], + "outDir": "./types", + "allowSyntheticDefaultImports": true, + "experimentalDecorators": true, + "forceConsistentCasingInFileNames": true, + "useDefineForClassFields": false, + "baseUrl": ".", + "incremental": true, + "skipLibCheck": true, + "moduleResolution": "bundler", + "allowImportingTsExtensions": true, + "resolveJsonModule": true, + "isolatedModules": true, + "noEmit": true, + "strict": true, + "noFallthroughCasesInSwitch": true, + "noImplicitReturns": true, + "paths": { + "@umbraco-cms/internal/test-utils": ["./utils/test-utils.ts"], + "@umbraco-cms/backoffice/app": ["./src/apps/app/index.ts"], + "@umbraco-cms/backoffice/class-api": ["./src/libs/class-api/index.ts"], + "@umbraco-cms/backoffice/context-api": [ + "./src/libs/context-api/index.ts" + ], + "@umbraco-cms/backoffice/controller-api": [ + "./src/libs/controller-api/index.ts" + ], + "@umbraco-cms/backoffice/element-api": [ + "./src/libs/element-api/index.ts" + ], + "@umbraco-cms/backoffice/extension-api": [ + "./src/libs/extension-api/index.ts" + ], + "@umbraco-cms/backoffice/localization-api": [ + "./src/libs/localization-api/index.ts" + ], + "@umbraco-cms/backoffice/observable-api": [ + "./src/libs/observable-api/index.ts" + ], + "@umbraco-cms/backoffice/auth": ["./src/shared/auth/index.ts"], + "@umbraco-cms/backoffice/event": ["./src/packages/core/event/index.ts"], + "@umbraco-cms/backoffice/lit-element": [ + "./src/packages/core/lit-element/index.ts" + ], + "@umbraco-cms/backoffice/icon": ["./src/shared/icon-registry/index.ts"], + "@umbraco-cms/backoffice/models": ["./src/shared/models/index.ts"], + "@umbraco-cms/backoffice/resources": ["./src/shared/resources/index.ts"], + "@umbraco-cms/backoffice/router": ["./src/shared/router/index.ts"], + "@umbraco-cms/backoffice/style": ["./src/shared/style/index.ts"], + "@umbraco-cms/backoffice/utils": ["./src/shared/utils/index.ts"], + "@umbraco-cms/backoffice/action": ["./src/packages/core/action/index.ts"], + "@umbraco-cms/backoffice/collection": [ + "./src/packages/core/collection/index.ts" + ], + "@umbraco-cms/backoffice/components": [ + "./src/packages/core/components/index.ts" + ], + "@umbraco-cms/backoffice/content-type": [ + "./src/packages/core/content-type/index.ts" + ], + "@umbraco-cms/backoffice/culture": [ + "./src/packages/core/culture/index.ts" + ], + "@umbraco-cms/backoffice/data-type": [ + "./src/packages/core/data-type/index.ts" + ], + "@umbraco-cms/backoffice/debug": ["./src/packages/core/debug/index.ts"], + "@umbraco-cms/backoffice/entity-action": [ + "./src/packages/core/entity-action/index.ts" + ], + "@umbraco-cms/backoffice/entity-bulk-action": [ + "./src/packages/core/entity-bulk-action/index.ts" + ], + "@umbraco-cms/backoffice/extension-registry": [ + "./src/packages/core/extension-registry/index.ts" + ], + "@umbraco-cms/backoffice/server-file-system": [ + "./src/packages/core/server-file-system/index.ts" + ], + "@umbraco-cms/backoffice/id": ["./src/packages/core/id/index.ts"], + "@umbraco-cms/backoffice/localization": [ + "./src/packages/core/localization/index.ts" + ], + "@umbraco-cms/backoffice/menu": ["./src/packages/core/menu/index.ts"], + "@umbraco-cms/backoffice/modal": ["./src/packages/core/modal/index.ts"], + "@umbraco-cms/backoffice/notification": [ + "./src/packages/core/notification/index.ts" + ], + "@umbraco-cms/backoffice/picker-input": [ + "./src/packages/core/picker-input/index.ts" + ], + "@umbraco-cms/backoffice/property": [ + "./src/packages/core/property/index.ts" + ], + "@umbraco-cms/backoffice/property-action": [ + "./src/packages/core/property-action/index.ts" + ], + "@umbraco-cms/backoffice/property-editor": [ + "./src/packages/core/property-editor/index.ts" + ], + "@umbraco-cms/backoffice/section": [ + "./src/packages/core/section/index.ts" + ], + "@umbraco-cms/backoffice/sorter": ["./src/packages/core/sorter/index.ts"], + "@umbraco-cms/backoffice/store": ["./src/packages/core/store/index.ts"], + "@umbraco-cms/backoffice/themes": ["./src/packages/core/themes/index.ts"], + "@umbraco-cms/backoffice/tree": ["./src/packages/core/tree/index.ts"], + "@umbraco-cms/backoffice/variant": [ + "./src/packages/core/variant/index.ts" + ], + "@umbraco-cms/backoffice/workspace": [ + "./src/packages/core/workspace/index.ts" + ], + "@umbraco-cms/backoffice/repository": [ + "./src/packages/core/repository/index.ts" + ], + "@umbraco-cms/backoffice/temporary-file": [ + "./src/packages/core/temporary-file/index.ts" + ], + "@umbraco-cms/backoffice/block": ["./src/packages/block/index.ts"], + "@umbraco-cms/backoffice/audit-log": [ + "./src/packages/audit-log/index.ts" + ], + "@umbraco-cms/backoffice/dictionary": [ + "./src/packages/dictionary/index.ts" + ], + "@umbraco-cms/backoffice/document": [ + "./src/packages/documents/documents/index.ts" + ], + "@umbraco-cms/backoffice/document-blueprint": [ + "./src/packages/documents/document-blueprints/index.ts" + ], + "@umbraco-cms/backoffice/document-type": [ + "./src/packages/documents/document-types/index.ts" + ], + "@umbraco-cms/backoffice/media": ["./src/packages/media/media/index.ts"], + "@umbraco-cms/backoffice/media-type": [ + "./src/packages/media/media-types/index.ts" + ], + "@umbraco-cms/backoffice/member": [ + "./src/packages/members/members/index.ts" + ], + "@umbraco-cms/backoffice/member-group": [ + "./src/packages/members/member-groups/index.ts" + ], + "@umbraco-cms/backoffice/member-type": [ + "./src/packages/members/member-types/index.ts" + ], + "@umbraco-cms/backoffice/package": [ + "./src/packages/packages/package/index.ts" + ], + "@umbraco-cms/backoffice/language": ["./src/packages/language/index.ts"], + "@umbraco-cms/backoffice/dynamic-root": [ + "./src/packages/dynamic-root/index.ts" + ], + "@umbraco-cms/backoffice/log-viewer": [ + "./src/packages/log-viewer/index.ts" + ], + "@umbraco-cms/backoffice/relation-type": [ + "./src/packages/relations/relation-types/index.ts" + ], + "@umbraco-cms/backoffice/relations": [ + "./src/packages/relations/relations/index.ts" + ], + "@umbraco-cms/backoffice/tags": ["./src/packages/tags/index.ts"], + "@umbraco-cms/backoffice/static-file": [ + "./src/packages/static-file/index.ts" + ], + "@umbraco-cms/backoffice/partial-view": [ + "./src/packages/templating/partial-views/index.ts" + ], + "@umbraco-cms/backoffice/stylesheet": [ + "./src/packages/templating/stylesheets/index.ts" + ], + "@umbraco-cms/backoffice/template": [ + "./src/packages/templating/templates/index.ts" + ], + "@umbraco-cms/backoffice/user-group": [ + "./src/packages/user/user-group/index.ts" + ], + "@umbraco-cms/backoffice/current-user": [ + "./src/packages/user/current-user/index.ts" + ], + "@umbraco-cms/backoffice/user": ["./src/packages/user/user/index.ts"], + "@umbraco-cms/backoffice/user-permission": [ + "./src/packages/user/user-permission/index.ts" + ], + "@umbraco-cms/backoffice/code-editor": [ + "./src/packages/templating/code-editor/index.ts" + ], + "@umbraco-cms/backoffice/external/backend-api": [ + "./src/external/backend-api/index.ts" + ], + "@umbraco-cms/backoffice/external/dompurify": [ + "./src/external/dompurify/index.ts" + ], + "@umbraco-cms/backoffice/external/lit": ["./src/external/lit/index.ts"], + "@umbraco-cms/backoffice/external/lodash": [ + "./src/external/lodash/index.ts" + ], + "@umbraco-cms/backoffice/external/marked": [ + "./src/external/marked/index.ts" + ], + "@umbraco-cms/backoffice/external/monaco-editor": [ + "./src/external/monaco-editor/index.ts" + ], + "@umbraco-cms/backoffice/external/openid": [ + "./src/external/openid/index.ts" + ], + "@umbraco-cms/backoffice/external/router-slot": [ + "./src/external/router-slot/index.ts" + ], + "@umbraco-cms/backoffice/external/rxjs": ["./src/external/rxjs/index.ts"], + "@umbraco-cms/backoffice/external/tinymce": [ + "./src/external/tinymce/index.ts" + ], + "@umbraco-cms/backoffice/external/uui": ["./src/external/uui/index.ts"], + "@umbraco-cms/backoffice/external/uuid": ["./src/external/uuid/index.ts"] + } + }, + "include": [ + "src/**/*.ts", + "apps/**/*.ts", + "e2e/**/*.ts", + "index.ts", + "storybook/stories/**/*.ts", + "examples/**/*.ts" + ], + "references": [ + { + "path": "./tsconfig.node.json" + } + ] } 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 e992b7190f..3a2e660553 100644 --- a/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs +++ b/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs @@ -3,6 +3,7 @@ import { playwrightLauncher } from '@web/test-runner-playwright'; import { importMapsPlugin } from '@web/dev-server-import-maps'; import rollupCommonjs from '@rollup/plugin-commonjs'; import { fromRollup } from '@web/dev-server-rollup'; +import { createImportMap } from './devops/importmap/index.js'; const commonjs = fromRollup(rollupCommonjs); @@ -24,110 +25,12 @@ export default { esbuildPlugin({ ts: true, tsconfig: './tsconfig.json', target: 'auto', json: true }), importMapsPlugin({ inject: { - importMap: { - imports: { - 'src/': './src/', - - '@umbraco-cms/backoffice/app': './src/apps/app/index.ts', - - '@umbraco-cms/backoffice/external/lit': './src/external/lit/index.ts', - '@umbraco-cms/backoffice/external/lodash': './src/external/lodash/index.ts', - '@umbraco-cms/backoffice/external/monaco-editor': './src/external/monaco-editor/index.ts', - '@umbraco-cms/backoffice/external/openid': './src/external/openid/index.ts', - '@umbraco-cms/backoffice/external/router-slot': './src/external/router-slot/index.ts', - '@umbraco-cms/backoffice/external/rxjs': './src/external/rxjs/index.ts', - '@umbraco-cms/backoffice/external/tinymce': './src/external/tinymce/index.ts', - '@umbraco-cms/backoffice/external/uui': './src/external/uui/index.ts', - '@umbraco-cms/backoffice/external/uuid': './src/external/uuid/index.ts', - '@umbraco-cms/backoffice/external/dompurify': './src/external/dompurify/index.ts', - '@umbraco-cms/backoffice/external/marked': './src/external/marked/index.ts', - - '@umbraco-cms/backoffice/backend-api': './src/external/backend-api/index.ts', - '@umbraco-cms/backoffice/class-api': './src/libs/class-api/index.ts', - '@umbraco-cms/backoffice/context-api': './src/libs/context-api/index.ts', - '@umbraco-cms/backoffice/controller-api': './src/libs/controller-api/index.ts', - '@umbraco-cms/backoffice/element-api': './src/libs/element-api/index.ts', - '@umbraco-cms/backoffice/extension-api': './src/libs/extension-api/index.ts', - '@umbraco-cms/backoffice/localization-api': './src/libs/localization-api/index.ts', - '@umbraco-cms/backoffice/observable-api': './src/libs/observable-api/index.ts', - - '@umbraco-cms/backoffice/auth': './src/shared/auth/index.ts', - '@umbraco-cms/backoffice/icon': './src/shared/icon-registry/index.ts', - '@umbraco-cms/backoffice/models': './src/shared/models/index.ts', - '@umbraco-cms/backoffice/resources': './src/shared/resources/index.ts', - '@umbraco-cms/backoffice/router': './src/shared/router/index.ts', - '@umbraco-cms/backoffice/style': './src/shared/style/index.ts', - '@umbraco-cms/backoffice/utils': './src/shared/utils/index.ts', - - '@umbraco-cms/internal/lit-element': './src/shared/lit-element/index.ts', - - '@umbraco-cms/backoffice/action': './src/packages/core/action/index.ts', - '@umbraco-cms/backoffice/collection': './src/packages/core/collection/index.ts', - '@umbraco-cms/backoffice/components': './src/packages/core/components/index.ts', - '@umbraco-cms/backoffice/content-type': './src/packages/core/content-type/index.ts', - '@umbraco-cms/backoffice/debug': './src/packages/core/debug/index.ts', - '@umbraco-cms/backoffice/entity-action': './src/packages/core/entity-action/index.ts', - '@umbraco-cms/backoffice/entity-bulk-action': './src/packages/core/entity-bulk-action/index.ts', - '@umbraco-cms/backoffice/extension-registry': './src/packages/core/extension-registry/index.ts', - '@umbraco-cms/backoffice/server-file-system': './src/packages/core/server-file-system/index.ts', - '@umbraco-cms/backoffice/id': './src/packages/core/id/index.ts', - '@umbraco-cms/backoffice/localization': './src/packages/core/localization/index.ts', - '@umbraco-cms/backoffice/menu': './src/packages/core/menu/index.ts', - '@umbraco-cms/backoffice/modal': './src/packages/core/modal/index.ts', - '@umbraco-cms/backoffice/notification': './src/packages/core/notification/index.ts', - '@umbraco-cms/backoffice/picker-input': './src/packages/core/picker-input/index.ts', - '@umbraco-cms/backoffice/property': './src/packages/core/property/index.ts', - '@umbraco-cms/backoffice/property-action': './src/packages/core/property-action/index.ts', - '@umbraco-cms/backoffice/property-editor': './src/packages/core/property-editor/index.ts', - '@umbraco-cms/backoffice/section': './src/packages/core/section/index.ts', - '@umbraco-cms/backoffice/sorter': './src/packages/core/sorter/index.ts', - '@umbraco-cms/backoffice/store': './src/packages/core/store/index.ts', - '@umbraco-cms/backoffice/themes': './src/packages/core/themes/index.ts', - '@umbraco-cms/backoffice/tree': './src/packages/core/tree/index.ts', - '@umbraco-cms/backoffice/variant': './src/packages/core/variant/index.ts', - '@umbraco-cms/backoffice/workspace': './src/packages/core/workspace/index.ts', - '@umbraco-cms/backoffice/culture': './src/packages/core/culture/index.ts', - '@umbraco-cms/backoffice/event': './src/packages/core/event/index.ts', - '@umbraco-cms/backoffice/repository': './src/packages/core/repository/index.ts', - '@umbraco-cms/backoffice/temporary-file': './src/packages/core/temporary-file/index.ts', - - '@umbraco-cms/backoffice/block': './src/packages/block/index.ts', - '@umbraco-cms/backoffice/audit-log': './src/packages/core/audit-log/index.ts', - '@umbraco-cms/backoffice/dictionary': './src/packages/dictionary/dictionary/index.ts', - - '@umbraco-cms/backoffice/document': './src/packages/documents/documents/index.ts', - '@umbraco-cms/backoffice/document-blueprint': './src/packages/documents/document-blueprints/index.ts', - '@umbraco-cms/backoffice/document-type': './src/packages/documents/document-types/index.ts', - '@umbraco-cms/backoffice/media': './src/packages/media/media/index.ts', - '@umbraco-cms/backoffice/media-type': './src/packages/media/media-types/index.ts', - '@umbraco-cms/backoffice/member': './src/packages/members/members/index.ts', - '@umbraco-cms/backoffice/member-group': './src/packages/members/member-groups/index.ts', - '@umbraco-cms/backoffice/member-type': './src/packages/members/member-types/index.ts', - '@umbraco-cms/backoffice/package': './src/packages/packages/package/index.ts', - - '@umbraco-cms/backoffice/language': './src/packages/language/index.ts', - - '@umbraco-cms/backoffice/data-type': './src/packages/core/data-type/index.ts', - '@umbraco-cms/backoffice/dynamic-root': './src/packages/dynamic-root/index.ts', - '@umbraco-cms/backoffice/logviewer': './src/packages/settings/logviewer/index.ts', - '@umbraco-cms/backoffice/relation-type': './src/packages/relations/relation-types/index.ts', - '@umbraco-cms/backoffice/relation': './src/packages/relations/relations/index.ts', - '@umbraco-cms/backoffice/tags': './src/packages/tags/index.ts', - '@umbraco-cms/backoffice/static-file': './src/packages/static-file/index.ts', - '@umbraco-cms/backoffice/partial-view': './src/packages/templating/partial-views/index.ts', - '@umbraco-cms/backoffice/stylesheet': './src/packages/templating/stylesheets/index.ts', - '@umbraco-cms/backoffice/template': './src/packages/templating/templates/index.ts', - - '@umbraco-cms/backoffice/user-group': './src/packages/user/user-group/index.ts', - '@umbraco-cms/backoffice/current-user': './src/packages/user/current-user/index.ts', - '@umbraco-cms/backoffice/user': './src/packages/user/user/index.ts', - '@umbraco-cms/backoffice/user-permission': './src/packages/user/user-permission/index.ts', - - '@umbraco-cms/backoffice/code-editor': './src/packages/templating/code-editor/index.ts', - + importMap: createImportMap({ + rootDir: './src', + additionalImports: { '@umbraco-cms/internal/test-utils': './utils/test-utils.ts', }, - }, + }), }, }), commonjs({