yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into feature/document-type-compositions

Browse Source
This commit is contained in:
Jacob Overgaard
2024-02-12 13:20:25 +01:00
committed by GitHub
parent e7d4f08b9d e76f684a4d
commit 7be4f33186
661 changed files with 3282 additions and 2311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI.Client/.github/CONTRIBUTING.md vendored
View File

@@ -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());

2
src/Umbraco.Web.UI.Client/.storybook/preview.js
View File

@@ -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';

2
src/Umbraco.Web.UI.Client/.vscode/lit.code-snippets vendored
View File

@@ -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 {",

2
src/Umbraco.Web.UI.Client/devops/eslint/rules/no-direct-api-import.cjs
View File

@@ -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,
},

26
src/Umbraco.Web.UI.Client/devops/importmap/index.js Normal file
View File

@@ -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,
};
};

6
src/Umbraco.Web.UI.Client/devops/package/index.js Normal file
View File

@@ -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;

61
src/Umbraco.Web.UI.Client/devops/tsconfig/index.js Normal file
View File

@@ -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);

14
src/Umbraco.Web.UI.Client/e2e/installer.spec.ts
View File

@@ -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<ServerStatusResponseModel>({
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"]');

14
src/Umbraco.Web.UI.Client/e2e/upgrader.spec.ts
View File

@@ -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<ServerStatusResponseModel>({
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"]');

4
src/Umbraco.Web.UI.Client/package-lock.json generated
View File

@@ -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",

21
src/Umbraco.Web.UI.Client/package.json
View File

@@ -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",
@@ -77,7 +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",
"./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",
"./examples/*": "./examples/*/index.js",
"./examples": "./examples/index.js"
},
@@ -131,7 +143,8 @@
"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"
},
"engines": {
"node": ">=20.9 <21",

4
src/Umbraco.Web.UI.Client/src/apps/app/app-error.element.ts
View File

@@ -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

4
src/Umbraco.Web.UI.Client/src/apps/app/app.element.ts
View File

@@ -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')

2
src/Umbraco.Web.UI.Client/src/apps/app/server-connection.ts
View File

@@ -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';

2
src/Umbraco.Web.UI.Client/src/apps/backoffice/backoffice.element.ts
View File

@@ -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';

4
src/Umbraco.Web.UI.Client/src/apps/backoffice/components/backoffice-header-sections.element.ts
View File

@@ -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')

4
src/Umbraco.Web.UI.Client/src/apps/backoffice/components/backoffice-header.element.ts
View File

@@ -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 {

6
src/Umbraco.Web.UI.Client/src/apps/backoffice/components/backoffice-main.element.ts
View File

@@ -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 {

4
src/Umbraco.Web.UI.Client/src/apps/backoffice/server-extension-registrator.controller.ts
View File

@@ -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

13
src/Umbraco.Web.UI.Client/src/apps/installer/consent/installer-consent.element.ts
View File

@@ -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 {

6
src/Umbraco.Web.UI.Client/src/apps/installer/database/installer-database.element.ts
View File

@@ -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')

8
src/Umbraco.Web.UI.Client/src/apps/installer/error/installer-error.element.ts
View File

@@ -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 {

4
src/Umbraco.Web.UI.Client/src/apps/installer/installer.context.ts
View File

@@ -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';

4
src/Umbraco.Web.UI.Client/src/apps/installer/installer.element.ts
View File

@@ -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';

6
src/Umbraco.Web.UI.Client/src/apps/installer/user/installer-user.element.ts
View File

@@ -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 {

14
src/Umbraco.Web.UI.Client/src/apps/upgrader/upgrader-view.element.ts
View File

@@ -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

6
src/Umbraco.Web.UI.Client/src/apps/upgrader/upgrader.element.ts
View File

@@ -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';

2
src/Umbraco.Web.UI.Client/src/assets/lang/en-us.ts
View File

@@ -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',

50
src/Umbraco.Web.UI.Client/src/css/umbraco-blockgridlayout.css Normal file
View File

@@ -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));
}
}

2
src/Umbraco.Web.UI.Client/src/libs/context-api/provide/context-provider.controller.test.ts
View File

@@ -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';

11
src/Umbraco.Web.UI.Client/src/libs/observable-api/utils/append-to-frozen-array.function.ts
View File

@@ -1,11 +1,12 @@
/**
* @export
* @method appendToFrozenArray
* @param {Observable<T>} 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 <caption>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.</caption>
* @param {Array<T>} 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<T>} - 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 <caption>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.</caption>
* const entry = {id: 'myKey', value: 'myValue'};
* const newDataSet = appendToFrozenArray(mySubject.getValue(), entry, x => x.id === id);
* mySubject.next(newDataSet);

7
src/Umbraco.Web.UI.Client/src/mocks/data/audit-log.data.ts
View File

@@ -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;

2
src/Umbraco.Web.UI.Client/src/mocks/data/culture.data.ts
View File

@@ -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 {

4
src/Umbraco.Web.UI.Client/src/mocks/data/data-type/data-type.data.ts
View File

@@ -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<UmbMockDataTypeModel> = [
},
{
alias: 'useInlineEditingAsDefault',
value: false,
value: true,
},
{
alias: 'useLiveEditing',

2
src/Umbraco.Web.UI.Client/src/mocks/data/data-type/data-type.db.ts
View File

@@ -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<UmbMockDataTypeModel> {
tree = new UmbMockEntityTreeManager<UmbMockDataTypeModel>(this, folderTreeItemMapper);

2
src/Umbraco.Web.UI.Client/src/mocks/data/dictionary/dictionary.data.ts
View File

@@ -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 &

2
src/Umbraco.Web.UI.Client/src/mocks/data/dictionary/dictionary.db.ts
View File

@@ -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<UmbMockDictionaryModel> {

4
src/Umbraco.Web.UI.Client/src/mocks/data/document-type/document-type.data.ts
View File

@@ -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 &

2
src/Umbraco.Web.UI.Client/src/mocks/data/document-type/document-type.db.ts
View File

@@ -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<UmbMockDocumentTypeModel> {
tree = new UmbMockEntityTreeManager<UmbMockDocumentTypeModel>(this, documentTypeTreeItemMapper);

7
src/Umbraco.Web.UI.Client/src/mocks/data/document/document-publishing.manager.ts
View File

@@ -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;

99
src/Umbraco.Web.UI.Client/src/mocks/data/document/document.data.ts
View File

@@ -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;
@@ -97,7 +97,8 @@ export const data: Array<UmbMockDocumentModel> = [
alias: 'multiNodeTreePicker',
culture: null,
segment: null,
value: null,
value:
'all-property-editors-document-id,c05da24d-7740-447b-9cdc-bd8ce2172e38,fd56a0b5-01a0-4da2-b428-52773bfa9cc4',
},
{
alias: 'datePicker',
@@ -202,6 +203,31 @@ export const data: Array<UmbMockDocumentModel> = [
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',
},
],
},
},
],
},
@@ -302,7 +328,72 @@ export const data: Array<UmbMockDocumentModel> = [
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',

2
src/Umbraco.Web.UI.Client/src/mocks/data/document/document.db.ts
View File

@@ -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<UmbMockDocumentModel> {

7
src/Umbraco.Web.UI.Client/src/mocks/data/examine.data.ts
View File

@@ -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) => {

7
src/Umbraco.Web.UI.Client/src/mocks/data/health-check.data.ts
View File

@@ -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());

2
src/Umbraco.Web.UI.Client/src/mocks/data/language/language.data.ts
View File

@@ -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;

2
src/Umbraco.Web.UI.Client/src/mocks/data/language/language.db.ts
View File

@@ -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<UmbMockLanguageModel> {
item = new UmbMockCultureItemManager<UmbMockLanguageModel>(this, itemResponseMapper);

2
src/Umbraco.Web.UI.Client/src/mocks/data/log-viewer.data.ts
View File

@@ -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<SavedLogSearchResponseModel> {

4
src/Umbraco.Web.UI.Client/src/mocks/data/logs.data.ts
View File

@@ -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 = [
{

2
src/Umbraco.Web.UI.Client/src/mocks/data/media-type/media-type.data.ts
View File

@@ -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;

2
src/Umbraco.Web.UI.Client/src/mocks/data/media-type/media-type.db.ts
View File

@@ -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<UmbMockMediaTypeModel> {
tree = new UmbMockEntityTreeManager<UmbMockMediaTypeModel>(this, mediaTypeTreeItemMapper);

2
src/Umbraco.Web.UI.Client/src/mocks/data/media/media.data.ts
View File

@@ -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;

2
src/Umbraco.Web.UI.Client/src/mocks/data/media/media.db.ts
View File

@@ -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<UmbMockMediaModel> {

2
src/Umbraco.Web.UI.Client/src/mocks/data/member-group.data.ts
View File

@@ -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<any> = [

2
src/Umbraco.Web.UI.Client/src/mocks/data/member-type.data.ts
View File

@@ -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<MemberTypeDetails> = [
{

2
src/Umbraco.Web.UI.Client/src/mocks/data/member.data.ts
View File

@@ -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<UmbMemberDetailModel> = [
{

2
src/Umbraco.Web.UI.Client/src/mocks/data/object-type/object-type.data.ts
View File

@@ -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<ObjectTypeResponseModel> = [
{

2
src/Umbraco.Web.UI.Client/src/mocks/data/partial-view/partial-view.data.ts
View File

@@ -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 &

2
src/Umbraco.Web.UI.Client/src/mocks/data/partial-view/partial-view.db.ts
View File

@@ -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<UmbMockPartialViewModel> {
tree = new UmbMockFileSystemTreeManager<UmbMockPartialViewModel>(this);

2
src/Umbraco.Web.UI.Client/src/mocks/data/relations/relation-type.data.ts
View File

@@ -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<RelationTypeResponseModel> = [
{

2
src/Umbraco.Web.UI.Client/src/mocks/data/relations/relation.data.ts
View File

@@ -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<RelationResponseModel> = [
{

2
src/Umbraco.Web.UI.Client/src/mocks/data/script/script.data.ts
View File

@@ -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;

2
src/Umbraco.Web.UI.Client/src/mocks/data/static-file/static-file.data.ts
View File

@@ -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<UmbMockStaticFileModelHack, 'type'> {}

2
src/Umbraco.Web.UI.Client/src/mocks/data/stylesheet/stylesheet.data.ts
View File

@@ -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 &

2
src/Umbraco.Web.UI.Client/src/mocks/data/template/template-detail.manager.ts
View File

@@ -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<UmbMockTemplateModel> {

4
src/Umbraco.Web.UI.Client/src/mocks/data/template/template.data.ts
View File

@@ -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;

2
src/Umbraco.Web.UI.Client/src/mocks/data/template/template.db.ts
View File

@@ -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<UmbMockTemplateModel> {
tree = new UmbMockEntityTreeManager<UmbMockTemplateModel>(this, folderTreeItemMapper);

2
src/Umbraco.Web.UI.Client/src/mocks/data/tracked-reference.data.ts
View File

@@ -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<RelationItemResponseModel> = [
{

2
src/Umbraco.Web.UI.Client/src/mocks/data/user-group/user-group.data.ts
View File

@@ -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,

2
src/Umbraco.Web.UI.Client/src/mocks/data/user-group/user-group.db.ts
View File

@@ -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<UmbMockUserGroupModel> {

4
src/Umbraco.Web.UI.Client/src/mocks/data/user/user.data.ts
View File

@@ -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;

4
src/Umbraco.Web.UI.Client/src/mocks/data/user/user.db.ts
View File

@@ -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);

2
src/Umbraco.Web.UI.Client/src/mocks/data/utils.ts
View File

@@ -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 {

2
src/Umbraco.Web.UI.Client/src/mocks/data/utils/entity/entity-folder.manager.ts
View File

@@ -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<MockItemType extends Omit<FolderTreeItemResponseModel, 'type'>> {
#db: UmbEntityMockDbBase<MockItemType>;

2
src/Umbraco.Web.UI.Client/src/mocks/data/utils/entity/entity-recycle-bin.ts
View File

@@ -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<ContentTreeItemResponseModel, 'type'>,

2
src/Umbraco.Web.UI.Client/src/mocks/data/utils/entity/entity-tree.manager.ts
View File

@@ -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<T extends Omit<EntityTreeItemResponseModel, 'type'>> {
#db: UmbEntityMockDbBase<T>;

2
src/Umbraco.Web.UI.Client/src/mocks/data/utils/file-system/file-system-base.ts
View File

@@ -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,

2
src/Umbraco.Web.UI.Client/src/mocks/data/utils/file-system/file-system-detail.manager.ts
View File

@@ -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<MockItemType extends FileSystemFileResponseModelBaseModel> {
#db: UmbFileSystemMockDbBase<MockItemType>;

2
src/Umbraco.Web.UI.Client/src/mocks/data/utils/file-system/file-system-folder.manager.ts
View File

@@ -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 },

2
src/Umbraco.Web.UI.Client/src/mocks/data/utils/file-system/file-system-item.manager.ts
View File

@@ -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<T extends FileSystemItemResponseModelBaseModel> {
#db: UmbMockDBBase<T>;

2
src/Umbraco.Web.UI.Client/src/mocks/data/utils/file-system/file-system-tree.manager.ts
View File

@@ -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<T extends Omit<FileSystemTreeItemPresentationModel, 'type'>> {
#db: UmbMockDBBase<T>;

2
src/Umbraco.Web.UI.Client/src/mocks/handlers/audit-log.handlers.ts
View File

@@ -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) => {

2
src/Umbraco.Web.UI.Client/src/mocks/handlers/data-type/copy.handlers.ts
View File

@@ -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 = [

5
src/Umbraco.Web.UI.Client/src/mocks/handlers/data-type/detail.handlers.ts
View File

@@ -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 = [

2
src/Umbraco.Web.UI.Client/src/mocks/handlers/data-type/move.handlers.ts
View File

@@ -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 = [

2
src/Umbraco.Web.UI.Client/src/mocks/handlers/dictionary/detail.handlers.ts
View File

@@ -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 = [

2
src/Umbraco.Web.UI.Client/src/mocks/handlers/dictionary/upload.handlers.ts
View File

@@ -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 = {

5
src/Umbraco.Web.UI.Client/src/mocks/handlers/document-type/detail.handlers.ts
View File

@@ -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 = [

5
src/Umbraco.Web.UI.Client/src/mocks/handlers/document/detail.handlers.ts
View File

@@ -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 = [

5
src/Umbraco.Web.UI.Client/src/mocks/handlers/document/publishing.handlers.ts
View File

@@ -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 = [

2
src/Umbraco.Web.UI.Client/src/mocks/handlers/dynamic-root.handlers.ts
View File

@@ -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;

2
src/Umbraco.Web.UI.Client/src/mocks/handlers/examine-management.handlers.ts
View File

@@ -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) => {

4
src/Umbraco.Web.UI.Client/src/mocks/handlers/health-check.handlers.ts
View File

@@ -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 = [

4
src/Umbraco.Web.UI.Client/src/mocks/handlers/install.handlers.ts
View File

@@ -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 = [

5
src/Umbraco.Web.UI.Client/src/mocks/handlers/language/detail.handlers.ts
View File

@@ -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 = [

2
src/Umbraco.Web.UI.Client/src/mocks/handlers/log-viewer.handlers.ts
View File

@@ -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

5
src/Umbraco.Web.UI.Client/src/mocks/handlers/media-type/detail.handlers.ts
View File

@@ -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 = [

2
src/Umbraco.Web.UI.Client/src/mocks/handlers/media/detail.handlers.ts
View File

@@ -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 = [

8
src/Umbraco.Web.UI.Client/src/mocks/handlers/modelsbuilder.handlers.ts
View File

@@ -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) => {

2
src/Umbraco.Web.UI.Client/src/mocks/handlers/package.handlers.ts
View File

@@ -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) => {

5
src/Umbraco.Web.UI.Client/src/mocks/handlers/partial-view/detail.handlers.ts
View File

@@ -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 = [

Some files were not shown because too many files have changed in this diff Show More