From 915a26589a6042d9191f05f0d59a419a16f20be0 Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Wed, 11 Sep 2024 15:54:29 +0200 Subject: [PATCH 01/43] feat: add methods and types to support version checking with local storage storage --- .../src/packages/sysinfo/index.ts | 1 + .../sysinfo/repository/sysinfo.repository.ts | 87 ++++++++++++++++++- .../src/packages/sysinfo/types.ts | 7 ++ 3 files changed, 94 insertions(+), 1 deletion(-) create mode 100644 src/Umbraco.Web.UI.Client/src/packages/sysinfo/types.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/sysinfo/index.ts b/src/Umbraco.Web.UI.Client/src/packages/sysinfo/index.ts index 6196778a18..cbcf692b21 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/sysinfo/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/sysinfo/index.ts @@ -1,3 +1,4 @@ export * from './components/sysinfo.element.js'; export * from './modals/index.js'; export * from './repository/index.js'; +export type * from './types.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/sysinfo/repository/sysinfo.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/sysinfo/repository/sysinfo.repository.ts index 39ea64fbe9..a325e705a8 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/sysinfo/repository/sysinfo.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/sysinfo/repository/sysinfo.repository.ts @@ -1,9 +1,12 @@ +import type { UmbServerConfiguration, UmbServerUpgradeCheck } from '../types.js'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { UmbRepositoryBase } from '@umbraco-cms/backoffice/repository'; -import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; +import { tryExecute, tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; import { ServerService } from '@umbraco-cms/backoffice/external/backend-api'; export class UmbSysinfoRepository extends UmbRepositoryBase { + #serverConfiguration?: UmbServerConfiguration; + constructor(host: UmbControllerHost) { super(host, 'Umb.Repository.Sysinfo'); } @@ -17,4 +20,86 @@ export class UmbSysinfoRepository extends UmbRepositoryBase { const { data } = await tryExecuteAndNotify(this, ServerService.getServerInformation()); return data; } + + async requestServerConfiguration() { + const { data } = await tryExecute(ServerService.getServerConfiguration()); + return data; + } + + async #getVersionCheckPeriod(): Promise { + if (!this.#serverConfiguration) { + this.#serverConfiguration = await this.requestServerConfiguration(); + } + + return this.#serverConfiguration?.versionCheckPeriod ?? 7; + } + + getStoredServerUpgradeCheck(lastCheck: Date): UmbServerUpgradeCheck | null { + const storedCheck = localStorage.getItem('umb:serverUpgradeCheck'); + if (storedCheck) { + const upgradeCheck = JSON.parse(storedCheck) as UmbServerUpgradeCheck; + // Check that the stored check is not older than the last check + const expiresAt = new Date(upgradeCheck.expires); + if (expiresAt.getTime() > lastCheck.getTime()) { + if (upgradeCheck.type.toLowerCase() !== 'none') { + return upgradeCheck; + } + } else { + localStorage.removeItem('umb:serverUpgradeCheck'); + } + } + + return null; + } + + async serverUpgradeCheck(): Promise { + // Check if we are allowed to check again + const versionCheckPeriod = await this.#getVersionCheckPeriod(); + + if (versionCheckPeriod <= 0) { + return null; + } + + let shouldCheck = true; + + const lastCheck = localStorage.getItem('umb:lastUpgradeCheck'); + const now = new Date(); + localStorage.setItem('umb:lastUpgradeCheck', now.toISOString()); + if (lastCheck) { + const lastCheckDate = new Date(lastCheck); + const diff = now.getTime() - lastCheckDate.getTime(); + const diffDays = diff / (1000 * 3600 * 24); + + if (diffDays < versionCheckPeriod) { + shouldCheck = false; + } + + // If we should not check, then return what we have stored if it is still valid + if (!shouldCheck) { + return this.getStoredServerUpgradeCheck(lastCheckDate); + } + } + + if (!shouldCheck) { + return null; + } + + // Check the server + const { data } = await tryExecute(ServerService.getServerUpgradeCheck()); + + if (data) { + // Save the last check date including the data received + const expiresAt = new Date(); + expiresAt.setDate(expiresAt.getDate() + versionCheckPeriod); + const upgradeCheck = { ...data, expires: expiresAt.toISOString() } satisfies UmbServerUpgradeCheck; + localStorage.setItem('umb:serverUpgradeCheck', JSON.stringify(upgradeCheck)); + + // Only return if we have a valid type + if (data.type.toLowerCase() !== 'none') { + return upgradeCheck; + } + } + + return null; + } } diff --git a/src/Umbraco.Web.UI.Client/src/packages/sysinfo/types.ts b/src/Umbraco.Web.UI.Client/src/packages/sysinfo/types.ts new file mode 100644 index 0000000000..d4a6519664 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/sysinfo/types.ts @@ -0,0 +1,7 @@ +import type { + ServerConfigurationResponseModel, + UpgradeCheckResponseModel, +} from '@umbraco-cms/backoffice/external/backend-api'; + +export type UmbServerConfiguration = ServerConfigurationResponseModel; +export type UmbServerUpgradeCheck = UpgradeCheckResponseModel & { expires: string }; From 2d9943c4efedf03b5ea472fd4cf4c597700fbaef Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Wed, 11 Sep 2024 15:56:23 +0200 Subject: [PATCH 02/43] feat: show a button in the backoffice logo area if a new version is available --- .../src/apps/backoffice/backoffice.context.ts | 7 +++++++ .../components/backoffice-header-logo.element.ts | 16 +++++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/apps/backoffice/backoffice.context.ts b/src/Umbraco.Web.UI.Client/src/apps/backoffice/backoffice.context.ts index 1ae88c7721..04580295bb 100644 --- a/src/Umbraco.Web.UI.Client/src/apps/backoffice/backoffice.context.ts +++ b/src/Umbraco.Web.UI.Client/src/apps/backoffice/backoffice.context.ts @@ -10,6 +10,7 @@ import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import type { UmbExtensionManifestInitializer } from '@umbraco-cms/backoffice/extension-api'; import { UMB_AUTH_CONTEXT } from '@umbraco-cms/backoffice/auth'; import { UMB_CURRENT_USER_CONTEXT } from '@umbraco-cms/backoffice/current-user'; +import { UmbSysinfoRepository } from '@umbraco-cms/backoffice/sysinfo'; export class UmbBackofficeContext extends UmbContextBase { #activeSectionAlias = new UmbStringState(undefined); @@ -76,6 +77,12 @@ export class UmbBackofficeContext extends UmbContextBase { public setActiveSectionAlias(alias: string) { this.#activeSectionAlias.setValue(alias); } + + public async serverUpgradeCheck(): Promise { + const repository = new UmbSysinfoRepository(this); + const check = await repository.serverUpgradeCheck(); + return !!check; + } } export const UMB_BACKOFFICE_CONTEXT = new UmbContextToken('UmbBackofficeContext'); diff --git a/src/Umbraco.Web.UI.Client/src/apps/backoffice/components/backoffice-header-logo.element.ts b/src/Umbraco.Web.UI.Client/src/apps/backoffice/components/backoffice-header-logo.element.ts index 48a93afc79..640fcb92c9 100644 --- a/src/Umbraco.Web.UI.Client/src/apps/backoffice/components/backoffice-header-logo.element.ts +++ b/src/Umbraco.Web.UI.Client/src/apps/backoffice/components/backoffice-header-logo.element.ts @@ -1,5 +1,5 @@ -import { isCurrentUserAnAdmin } from '@umbraco-cms/backoffice/current-user'; import { UMB_BACKOFFICE_CONTEXT } from '../backoffice.context.js'; +import { isCurrentUserAnAdmin } from '@umbraco-cms/backoffice/current-user'; import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; @@ -14,6 +14,11 @@ export class UmbBackofficeHeaderLogoElement extends UmbLitElement { @state() private _isUserAdmin = false; + @state() + private _serverUpgradeCheck = false; + + #backofficeContext?: typeof UMB_BACKOFFICE_CONTEXT.TYPE; + constructor() { super(); @@ -26,6 +31,8 @@ export class UmbBackofficeHeaderLogoElement extends UmbLitElement { }, '_observeVersion', ); + + this.#backofficeContext = context; }); this.#isAdmin(); @@ -33,6 +40,10 @@ export class UmbBackofficeHeaderLogoElement extends UmbLitElement { async #isAdmin() { this._isUserAdmin = await isCurrentUserAnAdmin(this); + + if (this._isUserAdmin) { + this._serverUpgradeCheck = this.#backofficeContext ? await this.#backofficeContext.serverUpgradeCheck() : false; + } } override render() { @@ -50,6 +61,9 @@ export class UmbBackofficeHeaderLogoElement extends UmbLitElement { height="82" loading="lazy" /> ${this._version} + + ${this._serverUpgradeCheck ? html`` : ''} + Umbraco.com ${this._isUserAdmin From b3b576c79a43960e02d48fefb7f5a42e7edffa21 Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Wed, 11 Sep 2024 15:59:26 +0200 Subject: [PATCH 03/43] feat: add localization --- .../backoffice/components/backoffice-header-logo.element.ts | 6 +++++- src/Umbraco.Web.UI.Client/src/assets/lang/da-dk.ts | 1 + src/Umbraco.Web.UI.Client/src/assets/lang/de-de.ts | 1 + src/Umbraco.Web.UI.Client/src/assets/lang/en-us.ts | 1 + src/Umbraco.Web.UI.Client/src/assets/lang/en.ts | 1 + 5 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/apps/backoffice/components/backoffice-header-logo.element.ts b/src/Umbraco.Web.UI.Client/src/apps/backoffice/components/backoffice-header-logo.element.ts index 640fcb92c9..8a8f7bb3ec 100644 --- a/src/Umbraco.Web.UI.Client/src/apps/backoffice/components/backoffice-header-logo.element.ts +++ b/src/Umbraco.Web.UI.Client/src/apps/backoffice/components/backoffice-header-logo.element.ts @@ -62,7 +62,11 @@ export class UmbBackofficeHeaderLogoElement extends UmbLitElement { loading="lazy" /> ${this._version} - ${this._serverUpgradeCheck ? html`` : ''} + ${this._serverUpgradeCheck + ? html`` + : ''} Umbraco.com diff --git a/src/Umbraco.Web.UI.Client/src/assets/lang/da-dk.ts b/src/Umbraco.Web.UI.Client/src/assets/lang/da-dk.ts index 0250bfb286..e4f3d47d6e 100644 --- a/src/Umbraco.Web.UI.Client/src/assets/lang/da-dk.ts +++ b/src/Umbraco.Web.UI.Client/src/assets/lang/da-dk.ts @@ -907,6 +907,7 @@ export default { lastUpdated: 'Last Updated', skipToMenu: 'Skip to menu', skipToContent: 'Skip to content', + newVersionAvailable: 'Ny version tilgængelig', }, colors: { blue: 'Blå', diff --git a/src/Umbraco.Web.UI.Client/src/assets/lang/de-de.ts b/src/Umbraco.Web.UI.Client/src/assets/lang/de-de.ts index 98b445f5a6..78e8c023a3 100644 --- a/src/Umbraco.Web.UI.Client/src/assets/lang/de-de.ts +++ b/src/Umbraco.Web.UI.Client/src/assets/lang/de-de.ts @@ -879,6 +879,7 @@ export default { header: 'Kopf', systemField: 'System Feld', lastUpdated: 'Zuletzt geändert', + newVersionAvailable: 'Neue Version verfügbar', }, colors: { blue: 'Blau', 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 26331a339d..786ab41123 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 @@ -918,6 +918,7 @@ export default { skipToMenu: 'Skip to menu', skipToContent: 'Skip to content', restore: 'Restore', + newVersionAvailable: 'New version available', }, colors: { blue: 'Blue', diff --git a/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts b/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts index 532405afd9..336543cb52 100644 --- a/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts +++ b/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts @@ -934,6 +934,7 @@ export default { media: 'Media', revert: 'Revert', validate: 'Validate', + newVersionAvailable: 'New version available', }, colors: { blue: 'Blue', From 9aa0e2c585ddf785c4835c88f543150b344148fb Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Wed, 11 Sep 2024 16:36:31 +0200 Subject: [PATCH 04/43] feat: register new modal to show version info --- .../sysinfo/components/new-version.element.ts | 61 +++++++++++++++++++ .../src/packages/sysinfo/index.ts | 1 - .../src/packages/sysinfo/manifests.ts | 24 +++++--- .../src/packages/sysinfo/modals/index.ts | 1 + .../sysinfo/modals/new-version-modal.token.ts | 8 +++ .../sysinfo/modals/sysinfo-modal.token.ts | 3 +- 6 files changed, 86 insertions(+), 12 deletions(-) create mode 100644 src/Umbraco.Web.UI.Client/src/packages/sysinfo/components/new-version.element.ts create mode 100644 src/Umbraco.Web.UI.Client/src/packages/sysinfo/modals/new-version-modal.token.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/sysinfo/components/new-version.element.ts b/src/Umbraco.Web.UI.Client/src/packages/sysinfo/components/new-version.element.ts new file mode 100644 index 0000000000..616b1b347c --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/sysinfo/components/new-version.element.ts @@ -0,0 +1,61 @@ +import { UmbSysinfoRepository } from '../repository/sysinfo.repository.js'; +import type { UmbServerUpgradeCheck } from '../types.js'; +import { customElement, html, state, when } from '@umbraco-cms/backoffice/external/lit'; +import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; +import { UmbModalBaseElement } from '@umbraco-cms/backoffice/modal'; + +@customElement('umb-new-version') +export class UmbNewVersionElement extends UmbModalBaseElement { + @state() + private _serverUpgradeCheck: UmbServerUpgradeCheck | null = null; + + #sysinfoRepository = new UmbSysinfoRepository(this); + + override async connectedCallback() { + super.connectedCallback(); + this._serverUpgradeCheck = await this.#sysinfoRepository.serverUpgradeCheck(); + } + + override render() { + return html` + + + ${when( + this._serverUpgradeCheck === null, + () => html``, + () => html`
${this._serverUpgradeCheck!.comment}
`, + )} + + + + ${this._serverUpgradeCheck?.url + ? html` + Read more + + ` + : ''} + + + `; + } + + static override readonly styles = [UmbTextStyles]; +} + +export default UmbNewVersionElement; + +declare global { + interface HTMLElementTagNameMap { + 'umb-new-version': UmbNewVersionElement; + } +} diff --git a/src/Umbraco.Web.UI.Client/src/packages/sysinfo/index.ts b/src/Umbraco.Web.UI.Client/src/packages/sysinfo/index.ts index cbcf692b21..92548a8dd7 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/sysinfo/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/sysinfo/index.ts @@ -1,4 +1,3 @@ -export * from './components/sysinfo.element.js'; export * from './modals/index.js'; export * from './repository/index.js'; export type * from './types.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/sysinfo/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/sysinfo/manifests.ts index fa57d5b840..6539cf9e67 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/sysinfo/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/sysinfo/manifests.ts @@ -1,12 +1,18 @@ import type { ManifestModal, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; -export const UMB_SYSINFO_MODAL_ALIAS = 'Umb.Modal.Sysinfo'; +const modalManifests: Array = [ + { + type: 'modal', + alias: 'Umb.Sysinfo.Modal', + name: 'Sysinfo Modal', + js: () => import('./components/sysinfo.element.js'), + }, + { + type: 'modal', + alias: 'Umb.NewVersion.Modal', + name: 'New Version Modal', + js: () => import('./components/new-version.element.js'), + }, +]; -const modalManifest: ManifestModal = { - type: 'modal', - alias: UMB_SYSINFO_MODAL_ALIAS, - name: 'Sysinfo Modal', - js: () => import('./components/sysinfo.element.js'), -}; - -export const manifests: Array = [modalManifest]; +export const manifests: Array = [...modalManifests]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/sysinfo/modals/index.ts b/src/Umbraco.Web.UI.Client/src/packages/sysinfo/modals/index.ts index 575d63fbd5..64dd56f433 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/sysinfo/modals/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/sysinfo/modals/index.ts @@ -1 +1,2 @@ +export * from './new-version-modal.token.js'; export * from './sysinfo-modal.token.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/sysinfo/modals/new-version-modal.token.ts b/src/Umbraco.Web.UI.Client/src/packages/sysinfo/modals/new-version-modal.token.ts new file mode 100644 index 0000000000..047bcbbf68 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/sysinfo/modals/new-version-modal.token.ts @@ -0,0 +1,8 @@ +import { UmbModalToken } from '@umbraco-cms/backoffice/modal'; + +export const UMB_NEWVERSION_MODAL = new UmbModalToken('Umb.NewVersion.Modal', { + modal: { + type: 'dialog', + size: 'medium', + }, +}); diff --git a/src/Umbraco.Web.UI.Client/src/packages/sysinfo/modals/sysinfo-modal.token.ts b/src/Umbraco.Web.UI.Client/src/packages/sysinfo/modals/sysinfo-modal.token.ts index d68114a4e3..b177c57851 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/sysinfo/modals/sysinfo-modal.token.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/sysinfo/modals/sysinfo-modal.token.ts @@ -1,7 +1,6 @@ import { UmbModalToken } from '@umbraco-cms/backoffice/modal'; -import { UMB_SYSINFO_MODAL_ALIAS } from '../manifests.js'; -export const UMB_SYSINFO_MODAL = new UmbModalToken(UMB_SYSINFO_MODAL_ALIAS, { +export const UMB_SYSINFO_MODAL = new UmbModalToken('Umb.Sysinfo.Modal', { modal: { type: 'dialog', size: 'medium', From f867717b111a7bce0e43b8527487f4c2154b3bb7 Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Wed, 11 Sep 2024 16:36:42 +0200 Subject: [PATCH 05/43] feat: update last check only once --- .../src/packages/sysinfo/repository/sysinfo.repository.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/sysinfo/repository/sysinfo.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/sysinfo/repository/sysinfo.repository.ts index a325e705a8..be042533c1 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/sysinfo/repository/sysinfo.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/sysinfo/repository/sysinfo.repository.ts @@ -64,7 +64,6 @@ export class UmbSysinfoRepository extends UmbRepositoryBase { const lastCheck = localStorage.getItem('umb:lastUpgradeCheck'); const now = new Date(); - localStorage.setItem('umb:lastUpgradeCheck', now.toISOString()); if (lastCheck) { const lastCheckDate = new Date(lastCheck); const diff = now.getTime() - lastCheckDate.getTime(); @@ -93,6 +92,7 @@ export class UmbSysinfoRepository extends UmbRepositoryBase { expiresAt.setDate(expiresAt.getDate() + versionCheckPeriod); const upgradeCheck = { ...data, expires: expiresAt.toISOString() } satisfies UmbServerUpgradeCheck; localStorage.setItem('umb:serverUpgradeCheck', JSON.stringify(upgradeCheck)); + localStorage.setItem('umb:lastUpgradeCheck', now.toISOString()); // Only return if we have a valid type if (data.type.toLowerCase() !== 'none') { From 255d163a82b12c2e3342c24dc7b7b5ef19fee344 Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Wed, 11 Sep 2024 16:36:53 +0200 Subject: [PATCH 06/43] feat: open the new version modal when a new version is available --- .../components/backoffice-header-logo.element.ts | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/apps/backoffice/components/backoffice-header-logo.element.ts b/src/Umbraco.Web.UI.Client/src/apps/backoffice/components/backoffice-header-logo.element.ts index 8a8f7bb3ec..e9429a77d0 100644 --- a/src/Umbraco.Web.UI.Client/src/apps/backoffice/components/backoffice-header-logo.element.ts +++ b/src/Umbraco.Web.UI.Client/src/apps/backoffice/components/backoffice-header-logo.element.ts @@ -4,7 +4,7 @@ import { css, html, customElement, state } from '@umbraco-cms/backoffice/externa import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal'; -import { UMB_SYSINFO_MODAL } from '@umbraco-cms/backoffice/sysinfo'; +import { UMB_NEWVERSION_MODAL, UMB_SYSINFO_MODAL } from '@umbraco-cms/backoffice/sysinfo'; @customElement('umb-backoffice-header-logo') export class UmbBackofficeHeaderLogoElement extends UmbLitElement { @@ -64,6 +64,7 @@ export class UmbBackofficeHeaderLogoElement extends UmbLitElement { ${this._serverUpgradeCheck ? html`` : ''} @@ -90,6 +91,14 @@ export class UmbBackofficeHeaderLogoElement extends UmbLitElement { .catch(() => {}); } + async #openNewVersion() { + const modalManager = await this.getContext(UMB_MODAL_MANAGER_CONTEXT); + modalManager + .open(this, UMB_NEWVERSION_MODAL) + .onSubmit() + .catch(() => {}); + } + static override styles = [ UmbTextStyles, css` From 70d450091855a48d14c54d4ac465c90964a073c7 Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Wed, 11 Sep 2024 16:42:16 +0200 Subject: [PATCH 07/43] update package lock --- src/Umbraco.Web.UI.Client/package-lock.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json index 9632640fa9..fe1f0406ca 100644 --- a/src/Umbraco.Web.UI.Client/package-lock.json +++ b/src/Umbraco.Web.UI.Client/package-lock.json @@ -23120,7 +23120,9 @@ "src/packages/static-file": { "name": "@umbraco-backoffice/static-file" }, - "src/packages/sysinfo": {}, + "src/packages/sysinfo": { + "name": "@umbraco-backoffice/sysinfo" + }, "src/packages/tags": { "name": "@umbraco-backoffice/tag" }, From f45a921d39920f017944a389367885b022a45f36 Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Wed, 11 Sep 2024 16:43:12 +0200 Subject: [PATCH 08/43] chore: make sonarcloud happy --- .../src/packages/sysinfo/repository/sysinfo.repository.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/sysinfo/repository/sysinfo.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/sysinfo/repository/sysinfo.repository.ts index be042533c1..fb8822b6ae 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/sysinfo/repository/sysinfo.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/sysinfo/repository/sysinfo.repository.ts @@ -37,7 +37,7 @@ export class UmbSysinfoRepository extends UmbRepositoryBase { getStoredServerUpgradeCheck(lastCheck: Date): UmbServerUpgradeCheck | null { const storedCheck = localStorage.getItem('umb:serverUpgradeCheck'); if (storedCheck) { - const upgradeCheck = JSON.parse(storedCheck) as UmbServerUpgradeCheck; + const upgradeCheck: UmbServerUpgradeCheck = JSON.parse(storedCheck); // Check that the stored check is not older than the last check const expiresAt = new Date(upgradeCheck.expires); if (expiresAt.getTime() > lastCheck.getTime()) { From dc65a14b7491e885e2ac42d8f5d72731e8466964 Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Wed, 11 Sep 2024 16:48:18 +0200 Subject: [PATCH 09/43] feat: add mock handlers for server endpoints --- .../src/mocks/handlers/server.handlers.ts | 39 +++++++++++++++---- 1 file changed, 31 insertions(+), 8 deletions(-) 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 6d4d62c268..2aadc06168 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,10 +1,12 @@ const { rest } = window.MockServiceWorker; import { - type ServerStatusResponseModel, - type ServerInformationResponseModel, - type ServerTroubleshootingResponseModel, RuntimeLevelModel, RuntimeModeModel, + type GetServerUpgradeCheckResponse, + type GetServerTroubleshootingResponse, + type GetServerInformationResponse, + type GetServerConfigurationResponse, + type GetServerStatusResponse, } from '@umbraco-cms/backoffice/external/backend-api'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; @@ -12,7 +14,7 @@ export const serverRunningHandler = rest.get(umbracoPath('/server/status'), (_re return res( // Respond with a 200 status code ctx.status(200), - ctx.json({ + ctx.json({ serverStatus: RuntimeLevelModel.RUN, }), ); @@ -22,7 +24,7 @@ export const serverMustInstallHandler = rest.get(umbracoPath('/server/status'), return res( // Respond with a 200 status code ctx.status(200), - ctx.json({ + ctx.json({ serverStatus: RuntimeLevelModel.INSTALL, }), ); @@ -32,18 +34,39 @@ export const serverMustUpgradeHandler = rest.get(umbracoPath('/server/status'), return res( // Respond with a 200 status code ctx.status(200), - ctx.json({ + ctx.json({ serverStatus: RuntimeLevelModel.UPGRADE, }), ); }); export const serverInformationHandlers = [ + rest.get(umbracoPath('/server/configuration'), (_req, res, ctx) => { + return res( + // Respond with a 200 status code + ctx.status(200), + ctx.json({ + allowPasswordReset: true, + versionCheckPeriod: 7, // days + }), + ); + }), + rest.get(umbracoPath('/server/upgrade-check'), (_req, res, ctx) => { + return res( + // Respond with a 200 status code + ctx.status(200), + ctx.json({ + type: 'Major', + comment: 'A new version is available', + url: 'https://our.umbraco.com/download/releases', + }), + ); + }), rest.get(umbracoPath('/server/information'), (_req, res, ctx) => { return res( // Respond with a 200 status code ctx.status(200), - ctx.json({ + ctx.json({ version: '14.0.0-preview004', assemblyVersion: '14.0.0-preview004', baseUtcOffset: '01:00:00', @@ -55,7 +78,7 @@ export const serverInformationHandlers = [ return res( // Respond with a 200 status code ctx.status(200), - ctx.json({ + ctx.json({ items: [ { name: 'Umbraco base url', data: location.origin }, { name: 'Mocked server', data: 'true' }, From 041e3201a82082c3e3f6dba3362ea8e642cf346f Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Wed, 11 Sep 2024 16:50:37 +0200 Subject: [PATCH 10/43] feat: make method internal --- .../sysinfo/repository/sysinfo.repository.ts | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/sysinfo/repository/sysinfo.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/sysinfo/repository/sysinfo.repository.ts index fb8822b6ae..2ca94e7533 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/sysinfo/repository/sysinfo.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/sysinfo/repository/sysinfo.repository.ts @@ -34,24 +34,6 @@ export class UmbSysinfoRepository extends UmbRepositoryBase { return this.#serverConfiguration?.versionCheckPeriod ?? 7; } - getStoredServerUpgradeCheck(lastCheck: Date): UmbServerUpgradeCheck | null { - const storedCheck = localStorage.getItem('umb:serverUpgradeCheck'); - if (storedCheck) { - const upgradeCheck: UmbServerUpgradeCheck = JSON.parse(storedCheck); - // Check that the stored check is not older than the last check - const expiresAt = new Date(upgradeCheck.expires); - if (expiresAt.getTime() > lastCheck.getTime()) { - if (upgradeCheck.type.toLowerCase() !== 'none') { - return upgradeCheck; - } - } else { - localStorage.removeItem('umb:serverUpgradeCheck'); - } - } - - return null; - } - async serverUpgradeCheck(): Promise { // Check if we are allowed to check again const versionCheckPeriod = await this.#getVersionCheckPeriod(); @@ -75,7 +57,7 @@ export class UmbSysinfoRepository extends UmbRepositoryBase { // If we should not check, then return what we have stored if it is still valid if (!shouldCheck) { - return this.getStoredServerUpgradeCheck(lastCheckDate); + return this.#getStoredServerUpgradeCheck(lastCheckDate); } } @@ -102,4 +84,22 @@ export class UmbSysinfoRepository extends UmbRepositoryBase { return null; } + + #getStoredServerUpgradeCheck(lastCheck: Date): UmbServerUpgradeCheck | null { + const storedCheck = localStorage.getItem('umb:serverUpgradeCheck'); + if (storedCheck) { + const upgradeCheck: UmbServerUpgradeCheck = JSON.parse(storedCheck); + // Check that the stored check is not older than the last check + const expiresAt = new Date(upgradeCheck.expires); + if (expiresAt.getTime() > lastCheck.getTime()) { + if (upgradeCheck.type.toLowerCase() !== 'none') { + return upgradeCheck; + } + } else { + localStorage.removeItem('umb:serverUpgradeCheck'); + } + } + + return null; + } } From 1a210b3e18eb883de689c0bcadab9e1f110b9029 Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Wed, 11 Sep 2024 16:51:02 +0200 Subject: [PATCH 11/43] chore: sort methods --- .../sysinfo/repository/sysinfo.repository.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/sysinfo/repository/sysinfo.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/sysinfo/repository/sysinfo.repository.ts index 2ca94e7533..5f86a53cc6 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/sysinfo/repository/sysinfo.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/sysinfo/repository/sysinfo.repository.ts @@ -26,14 +26,6 @@ export class UmbSysinfoRepository extends UmbRepositoryBase { return data; } - async #getVersionCheckPeriod(): Promise { - if (!this.#serverConfiguration) { - this.#serverConfiguration = await this.requestServerConfiguration(); - } - - return this.#serverConfiguration?.versionCheckPeriod ?? 7; - } - async serverUpgradeCheck(): Promise { // Check if we are allowed to check again const versionCheckPeriod = await this.#getVersionCheckPeriod(); @@ -85,6 +77,14 @@ export class UmbSysinfoRepository extends UmbRepositoryBase { return null; } + async #getVersionCheckPeriod(): Promise { + if (!this.#serverConfiguration) { + this.#serverConfiguration = await this.requestServerConfiguration(); + } + + return this.#serverConfiguration?.versionCheckPeriod ?? 7; + } + #getStoredServerUpgradeCheck(lastCheck: Date): UmbServerUpgradeCheck | null { const storedCheck = localStorage.getItem('umb:serverUpgradeCheck'); if (storedCheck) { From c2849ac81cdb9f4c76a0a4c7c8e7294e620ea854 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Thu, 12 Sep 2024 11:45:06 +0200 Subject: [PATCH 12/43] expose properties --- .../content-type-structure-manager.class.ts | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/structure/content-type-structure-manager.class.ts b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/structure/content-type-structure-manager.class.ts index 268bea7841..9b87b7f6bc 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/structure/content-type-structure-manager.class.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/structure/content-type-structure-manager.class.ts @@ -46,8 +46,13 @@ export class UmbContentTypeStructureManager< (x) => x.find((y) => y.unique === this.#ownerContentTypeUnique)?.compositions, ); - readonly #contentTypeContainers = this.#contentTypes.asObservablePart(() => { - return this.#contentTypes.getValue().flatMap((x) => x.containers ?? []); + readonly #contentTypeContainers = this.#contentTypes.asObservablePart((contentTypes) => { + // Notice this may need to use getValue to avoid resetting it self. [NL] + return contentTypes.flatMap((x) => x.containers ?? []); + }); + readonly contentTypeProperties = this.#contentTypes.asObservablePart((contentTypes) => { + // Notice this may need to use getValue to avoid resetting it self. [NL] + return contentTypes.flatMap((x) => x.properties ?? []); }); readonly contentTypeUniques = this.#contentTypes.asObservablePart((x) => x.map((y) => y.unique)); readonly contentTypeAliases = this.#contentTypes.asObservablePart((x) => x.map((y) => y.alias)); @@ -77,7 +82,8 @@ export class UmbContentTypeStructureManager< /** * loadType will load the ContentType and all inherited and composed ContentTypes. * This will give us all the structure for properties and containers. - * @param unique + * @param {string} unique - The unique of the ContentType to load. + * @returns {Promise} - Promise resolved */ public async loadType(unique?: string) { this._reset(); @@ -219,6 +225,14 @@ export class UmbContentTypeStructureManager< return this.#ownerContentTypeUnique; } + /** + * Figure out if any of the Content Types has a Property. + * @returns {boolean} - true if any of the Content Type in this composition has a Property. + */ + getHasProperties() { + return this.#contentTypes.getValue().some((y) => y.properties.length > 0); + } + updateOwnerContentType(entry: Partial) { this.#contentTypes.updateOne(this.#ownerContentTypeUnique, entry); } From af3fa5ad38b8a024ab3809bae125a3807bcebfab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Thu, 12 Sep 2024 11:45:21 +0200 Subject: [PATCH 13/43] correct JSDocs --- .../property-dataset/property-dataset.element.ts | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) 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 b2b9de344e..04e4cb7c54 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 @@ -16,10 +16,10 @@ export class UmbPropertyDatasetElement extends UmbLitElement { public readonly context: UmbPropertyDatasetContextBase; + @property({ attribute: false }) /** * The value of the dataset. - * @returns {Array} - * @memberof UmbBasicVariantElement + * @returns {Array} - The value of the dataset * @example * ```ts * const dataSet = [ @@ -46,7 +46,6 @@ export class UmbPropertyDatasetElement extends UmbLitElement { * ` * ``` */ - @property({ attribute: false }) public set value(value: Array) { this.#allowChangeEvent = false; this.context.setValues(value); @@ -57,11 +56,12 @@ export class UmbPropertyDatasetElement extends UmbLitElement { return this.context.getValues(); } + @property({ attribute: false }) /** * The name of the dataset, this name varies depending on the use-case. But this is either + * @property name * @type {string} * @returns {string} - * @memberof UmbBasicVariantElement * @example * ```ts * html` @@ -70,7 +70,6 @@ export class UmbPropertyDatasetElement extends UmbLitElement { * * ` */ - @property({ attribute: false }) public set name(value: string | undefined) { this.#allowChangeEvent = false; this.context.setName(value); From 08bed37357238178687a7d18ac0381b4fb7a1d2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Thu, 12 Sep 2024 11:45:26 +0200 Subject: [PATCH 14/43] package lock --- src/Umbraco.Web.UI.Client/package-lock.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json index 9632640fa9..fe1f0406ca 100644 --- a/src/Umbraco.Web.UI.Client/package-lock.json +++ b/src/Umbraco.Web.UI.Client/package-lock.json @@ -23120,7 +23120,9 @@ "src/packages/static-file": { "name": "@umbraco-backoffice/static-file" }, - "src/packages/sysinfo": {}, + "src/packages/sysinfo": { + "name": "@umbraco-backoffice/sysinfo" + }, "src/packages/tags": { "name": "@umbraco-backoffice/tag" }, From d5e90a51a3745882d3958f07547daee9ab678d08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Thu, 12 Sep 2024 11:48:37 +0200 Subject: [PATCH 15/43] contentTypePropertyAliases --- .../structure/content-type-structure-manager.class.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/structure/content-type-structure-manager.class.ts b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/structure/content-type-structure-manager.class.ts index 9b87b7f6bc..796a6a0801 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/structure/content-type-structure-manager.class.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/structure/content-type-structure-manager.class.ts @@ -54,6 +54,9 @@ export class UmbContentTypeStructureManager< // Notice this may need to use getValue to avoid resetting it self. [NL] return contentTypes.flatMap((x) => x.properties ?? []); }); + readonly contentTypePropertyAliases = this.#contentTypes.asObservablePart((contentTypes) => { + return contentTypes.flatMap((x) => x.properties ?? []).map((x) => x.alias); + }); readonly contentTypeUniques = this.#contentTypes.asObservablePart((x) => x.map((y) => y.unique)); readonly contentTypeAliases = this.#contentTypes.asObservablePart((x) => x.map((y) => y.alias)); From dfffa318499ed5738f7577b22b577e2266e7d56f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Thu, 12 Sep 2024 11:51:58 +0200 Subject: [PATCH 16/43] contentTypePropertyAliases --- .../documents/workspace/document-workspace.context.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 74b0629683..9eaa8c1d43 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 @@ -25,7 +25,7 @@ import { } from '../paths.js'; import { UMB_DOCUMENTS_SECTION_PATH } from '../../section/paths.js'; import { UmbDocumentPreviewRepository } from '../repository/preview/index.js'; - +import { sortVariants } from '../utils.js'; import { UMB_DOCUMENT_WORKSPACE_ALIAS } from './manifests.js'; import { UmbEntityContext } from '@umbraco-cms/backoffice/entity'; import { UMB_INVARIANT_CULTURE, UmbVariantId } from '@umbraco-cms/backoffice/variant'; @@ -68,7 +68,6 @@ import type { UmbContentWorkspaceContext } from '@umbraco-cms/backoffice/content import type { UmbDocumentTypeDetailModel } from '@umbraco-cms/backoffice/document-type'; import { UmbIsTrashedEntityContext } from '@umbraco-cms/backoffice/recycle-bin'; import { UmbReadOnlyVariantStateManager } from '@umbraco-cms/backoffice/utils'; -import { sortVariants } from '../utils.js'; type EntityType = UmbDocumentDetailModel; export class UmbDocumentWorkspaceContext From 1ef7a9d506426e3fff5acafce1a011f4aa4e7146 Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Thu, 12 Sep 2024 11:52:05 +0200 Subject: [PATCH 17/43] chore: generate server api --- .../external/backend-api/src/services.gen.ts | 17 ++++++++++++++++- .../src/external/backend-api/src/types.gen.ts | 9 +++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/external/backend-api/src/services.gen.ts b/src/Umbraco.Web.UI.Client/src/external/backend-api/src/services.gen.ts index 7a132b3073..5475bae356 100644 --- a/src/Umbraco.Web.UI.Client/src/external/backend-api/src/services.gen.ts +++ b/src/Umbraco.Web.UI.Client/src/external/backend-api/src/services.gen.ts @@ -3,7 +3,7 @@ import type { CancelablePromise } from './core/CancelablePromise'; import { OpenAPI } from './core/OpenAPI'; import { request as __request } from './core/request'; -import type { GetCultureData, GetCultureResponse, PostDataTypeData, PostDataTypeResponse, GetDataTypeByIdData, GetDataTypeByIdResponse, DeleteDataTypeByIdData, DeleteDataTypeByIdResponse, PutDataTypeByIdData, PutDataTypeByIdResponse, PostDataTypeByIdCopyData, PostDataTypeByIdCopyResponse, GetDataTypeByIdIsUsedData, GetDataTypeByIdIsUsedResponse, PutDataTypeByIdMoveData, PutDataTypeByIdMoveResponse, GetDataTypeByIdReferencesData, GetDataTypeByIdReferencesResponse, GetDataTypeConfigurationResponse, PostDataTypeFolderData, PostDataTypeFolderResponse, GetDataTypeFolderByIdData, GetDataTypeFolderByIdResponse, DeleteDataTypeFolderByIdData, DeleteDataTypeFolderByIdResponse, PutDataTypeFolderByIdData, PutDataTypeFolderByIdResponse, GetFilterDataTypeData, GetFilterDataTypeResponse, GetItemDataTypeData, GetItemDataTypeResponse, GetItemDataTypeSearchData, GetItemDataTypeSearchResponse, GetTreeDataTypeAncestorsData, GetTreeDataTypeAncestorsResponse, GetTreeDataTypeChildrenData, GetTreeDataTypeChildrenResponse, GetTreeDataTypeRootData, GetTreeDataTypeRootResponse, GetDictionaryData, GetDictionaryResponse, PostDictionaryData, PostDictionaryResponse, GetDictionaryByIdData, GetDictionaryByIdResponse, DeleteDictionaryByIdData, DeleteDictionaryByIdResponse, PutDictionaryByIdData, PutDictionaryByIdResponse, GetDictionaryByIdExportData, GetDictionaryByIdExportResponse, PutDictionaryByIdMoveData, PutDictionaryByIdMoveResponse, PostDictionaryImportData, PostDictionaryImportResponse, GetItemDictionaryData, GetItemDictionaryResponse, GetTreeDictionaryAncestorsData, GetTreeDictionaryAncestorsResponse, GetTreeDictionaryChildrenData, GetTreeDictionaryChildrenResponse, GetTreeDictionaryRootData, GetTreeDictionaryRootResponse, PostDocumentBlueprintData, PostDocumentBlueprintResponse, GetDocumentBlueprintByIdData, GetDocumentBlueprintByIdResponse, DeleteDocumentBlueprintByIdData, DeleteDocumentBlueprintByIdResponse, PutDocumentBlueprintByIdData, PutDocumentBlueprintByIdResponse, PutDocumentBlueprintByIdMoveData, PutDocumentBlueprintByIdMoveResponse, PostDocumentBlueprintFolderData, PostDocumentBlueprintFolderResponse, GetDocumentBlueprintFolderByIdData, GetDocumentBlueprintFolderByIdResponse, DeleteDocumentBlueprintFolderByIdData, DeleteDocumentBlueprintFolderByIdResponse, PutDocumentBlueprintFolderByIdData, PutDocumentBlueprintFolderByIdResponse, PostDocumentBlueprintFromDocumentData, PostDocumentBlueprintFromDocumentResponse, GetItemDocumentBlueprintData, GetItemDocumentBlueprintResponse, GetTreeDocumentBlueprintAncestorsData, GetTreeDocumentBlueprintAncestorsResponse, GetTreeDocumentBlueprintChildrenData, GetTreeDocumentBlueprintChildrenResponse, GetTreeDocumentBlueprintRootData, GetTreeDocumentBlueprintRootResponse, PostDocumentTypeData, PostDocumentTypeResponse, GetDocumentTypeByIdData, GetDocumentTypeByIdResponse, DeleteDocumentTypeByIdData, DeleteDocumentTypeByIdResponse, PutDocumentTypeByIdData, PutDocumentTypeByIdResponse, GetDocumentTypeByIdAllowedChildrenData, GetDocumentTypeByIdAllowedChildrenResponse, GetDocumentTypeByIdBlueprintData, GetDocumentTypeByIdBlueprintResponse, GetDocumentTypeByIdCompositionReferencesData, GetDocumentTypeByIdCompositionReferencesResponse, PostDocumentTypeByIdCopyData, PostDocumentTypeByIdCopyResponse, GetDocumentTypeByIdExportData, GetDocumentTypeByIdExportResponse, PutDocumentTypeByIdImportData, PutDocumentTypeByIdImportResponse, PutDocumentTypeByIdMoveData, PutDocumentTypeByIdMoveResponse, GetDocumentTypeAllowedAtRootData, GetDocumentTypeAllowedAtRootResponse, PostDocumentTypeAvailableCompositionsData, PostDocumentTypeAvailableCompositionsResponse, GetDocumentTypeConfigurationResponse, PostDocumentTypeFolderData, PostDocumentTypeFolderResponse, GetDocumentTypeFolderByIdData, GetDocumentTypeFolderByIdResponse, DeleteDocumentTypeFolderByIdData, DeleteDocumentTypeFolderByIdResponse, PutDocumentTypeFolderByIdData, PutDocumentTypeFolderByIdResponse, PostDocumentTypeImportData, PostDocumentTypeImportResponse, GetItemDocumentTypeData, GetItemDocumentTypeResponse, GetItemDocumentTypeSearchData, GetItemDocumentTypeSearchResponse, GetTreeDocumentTypeAncestorsData, GetTreeDocumentTypeAncestorsResponse, GetTreeDocumentTypeChildrenData, GetTreeDocumentTypeChildrenResponse, GetTreeDocumentTypeRootData, GetTreeDocumentTypeRootResponse, GetDocumentVersionData, GetDocumentVersionResponse, GetDocumentVersionByIdData, GetDocumentVersionByIdResponse, PutDocumentVersionByIdPreventCleanupData, PutDocumentVersionByIdPreventCleanupResponse, PostDocumentVersionByIdRollbackData, PostDocumentVersionByIdRollbackResponse, GetCollectionDocumentByIdData, GetCollectionDocumentByIdResponse, PostDocumentData, PostDocumentResponse, GetDocumentByIdData, GetDocumentByIdResponse, DeleteDocumentByIdData, DeleteDocumentByIdResponse, PutDocumentByIdData, PutDocumentByIdResponse, GetDocumentByIdAuditLogData, GetDocumentByIdAuditLogResponse, PostDocumentByIdCopyData, PostDocumentByIdCopyResponse, GetDocumentByIdDomainsData, GetDocumentByIdDomainsResponse, PutDocumentByIdDomainsData, PutDocumentByIdDomainsResponse, PutDocumentByIdMoveData, PutDocumentByIdMoveResponse, PutDocumentByIdMoveToRecycleBinData, PutDocumentByIdMoveToRecycleBinResponse, GetDocumentByIdNotificationsData, GetDocumentByIdNotificationsResponse, PutDocumentByIdNotificationsData, PutDocumentByIdNotificationsResponse, PostDocumentByIdPublicAccessData, PostDocumentByIdPublicAccessResponse, DeleteDocumentByIdPublicAccessData, DeleteDocumentByIdPublicAccessResponse, GetDocumentByIdPublicAccessData, GetDocumentByIdPublicAccessResponse, PutDocumentByIdPublicAccessData, PutDocumentByIdPublicAccessResponse, PutDocumentByIdPublishData, PutDocumentByIdPublishResponse, PutDocumentByIdPublishWithDescendantsData, PutDocumentByIdPublishWithDescendantsResponse, GetDocumentByIdReferencedByData, GetDocumentByIdReferencedByResponse, GetDocumentByIdReferencedDescendantsData, GetDocumentByIdReferencedDescendantsResponse, PutDocumentByIdUnpublishData, PutDocumentByIdUnpublishResponse, PutDocumentByIdValidateData, PutDocumentByIdValidateResponse, GetDocumentAreReferencedData, GetDocumentAreReferencedResponse, GetDocumentConfigurationResponse, PutDocumentSortData, PutDocumentSortResponse, GetDocumentUrlsData, GetDocumentUrlsResponse, PostDocumentValidateData, PostDocumentValidateResponse, GetItemDocumentData, GetItemDocumentResponse, GetItemDocumentSearchData, GetItemDocumentSearchResponse, DeleteRecycleBinDocumentResponse, DeleteRecycleBinDocumentByIdData, DeleteRecycleBinDocumentByIdResponse, GetRecycleBinDocumentByIdOriginalParentData, GetRecycleBinDocumentByIdOriginalParentResponse, PutRecycleBinDocumentByIdRestoreData, PutRecycleBinDocumentByIdRestoreResponse, GetRecycleBinDocumentChildrenData, GetRecycleBinDocumentChildrenResponse, GetRecycleBinDocumentRootData, GetRecycleBinDocumentRootResponse, GetTreeDocumentAncestorsData, GetTreeDocumentAncestorsResponse, GetTreeDocumentChildrenData, GetTreeDocumentChildrenResponse, GetTreeDocumentRootData, GetTreeDocumentRootResponse, PostDynamicRootQueryData, PostDynamicRootQueryResponse, GetDynamicRootStepsResponse, GetHealthCheckGroupData, GetHealthCheckGroupResponse, GetHealthCheckGroupByNameData, GetHealthCheckGroupByNameResponse, PostHealthCheckGroupByNameCheckData, PostHealthCheckGroupByNameCheckResponse, PostHealthCheckExecuteActionData, PostHealthCheckExecuteActionResponse, GetHelpData, GetHelpResponse, GetImagingResizeUrlsData, GetImagingResizeUrlsResponse, GetImportAnalyzeData, GetImportAnalyzeResponse, GetIndexerData, GetIndexerResponse, GetIndexerByIndexNameData, GetIndexerByIndexNameResponse, PostIndexerByIndexNameRebuildData, PostIndexerByIndexNameRebuildResponse, GetInstallSettingsResponse, PostInstallSetupData, PostInstallSetupResponse, PostInstallValidateDatabaseData, PostInstallValidateDatabaseResponse, GetItemLanguageData, GetItemLanguageResponse, GetItemLanguageDefaultResponse, GetLanguageData, GetLanguageResponse, PostLanguageData, PostLanguageResponse, GetLanguageByIsoCodeData, GetLanguageByIsoCodeResponse, DeleteLanguageByIsoCodeData, DeleteLanguageByIsoCodeResponse, PutLanguageByIsoCodeData, PutLanguageByIsoCodeResponse, GetLogViewerLevelData, GetLogViewerLevelResponse, GetLogViewerLevelCountData, GetLogViewerLevelCountResponse, GetLogViewerLogData, GetLogViewerLogResponse, GetLogViewerMessageTemplateData, GetLogViewerMessageTemplateResponse, GetLogViewerSavedSearchData, GetLogViewerSavedSearchResponse, PostLogViewerSavedSearchData, PostLogViewerSavedSearchResponse, GetLogViewerSavedSearchByNameData, GetLogViewerSavedSearchByNameResponse, DeleteLogViewerSavedSearchByNameData, DeleteLogViewerSavedSearchByNameResponse, GetLogViewerValidateLogsSizeData, GetLogViewerValidateLogsSizeResponse, GetManifestManifestResponse, GetManifestManifestPrivateResponse, GetManifestManifestPublicResponse, GetItemMediaTypeData, GetItemMediaTypeResponse, GetItemMediaTypeAllowedData, GetItemMediaTypeAllowedResponse, GetItemMediaTypeFoldersData, GetItemMediaTypeFoldersResponse, GetItemMediaTypeSearchData, GetItemMediaTypeSearchResponse, PostMediaTypeData, PostMediaTypeResponse, GetMediaTypeByIdData, GetMediaTypeByIdResponse, DeleteMediaTypeByIdData, DeleteMediaTypeByIdResponse, PutMediaTypeByIdData, PutMediaTypeByIdResponse, GetMediaTypeByIdAllowedChildrenData, GetMediaTypeByIdAllowedChildrenResponse, GetMediaTypeByIdCompositionReferencesData, GetMediaTypeByIdCompositionReferencesResponse, PostMediaTypeByIdCopyData, PostMediaTypeByIdCopyResponse, GetMediaTypeByIdExportData, GetMediaTypeByIdExportResponse, PutMediaTypeByIdImportData, PutMediaTypeByIdImportResponse, PutMediaTypeByIdMoveData, PutMediaTypeByIdMoveResponse, GetMediaTypeAllowedAtRootData, GetMediaTypeAllowedAtRootResponse, PostMediaTypeAvailableCompositionsData, PostMediaTypeAvailableCompositionsResponse, GetMediaTypeConfigurationResponse, PostMediaTypeFolderData, PostMediaTypeFolderResponse, GetMediaTypeFolderByIdData, GetMediaTypeFolderByIdResponse, DeleteMediaTypeFolderByIdData, DeleteMediaTypeFolderByIdResponse, PutMediaTypeFolderByIdData, PutMediaTypeFolderByIdResponse, PostMediaTypeImportData, PostMediaTypeImportResponse, GetTreeMediaTypeAncestorsData, GetTreeMediaTypeAncestorsResponse, GetTreeMediaTypeChildrenData, GetTreeMediaTypeChildrenResponse, GetTreeMediaTypeRootData, GetTreeMediaTypeRootResponse, GetCollectionMediaData, GetCollectionMediaResponse, GetItemMediaData, GetItemMediaResponse, GetItemMediaSearchData, GetItemMediaSearchResponse, PostMediaData, PostMediaResponse, GetMediaByIdData, GetMediaByIdResponse, DeleteMediaByIdData, DeleteMediaByIdResponse, PutMediaByIdData, PutMediaByIdResponse, GetMediaByIdAuditLogData, GetMediaByIdAuditLogResponse, PutMediaByIdMoveData, PutMediaByIdMoveResponse, PutMediaByIdMoveToRecycleBinData, PutMediaByIdMoveToRecycleBinResponse, GetMediaByIdReferencedByData, GetMediaByIdReferencedByResponse, GetMediaByIdReferencedDescendantsData, GetMediaByIdReferencedDescendantsResponse, PutMediaByIdValidateData, PutMediaByIdValidateResponse, GetMediaAreReferencedData, GetMediaAreReferencedResponse, GetMediaConfigurationResponse, PutMediaSortData, PutMediaSortResponse, GetMediaUrlsData, GetMediaUrlsResponse, PostMediaValidateData, PostMediaValidateResponse, DeleteRecycleBinMediaResponse, DeleteRecycleBinMediaByIdData, DeleteRecycleBinMediaByIdResponse, GetRecycleBinMediaByIdOriginalParentData, GetRecycleBinMediaByIdOriginalParentResponse, PutRecycleBinMediaByIdRestoreData, PutRecycleBinMediaByIdRestoreResponse, GetRecycleBinMediaChildrenData, GetRecycleBinMediaChildrenResponse, GetRecycleBinMediaRootData, GetRecycleBinMediaRootResponse, GetTreeMediaAncestorsData, GetTreeMediaAncestorsResponse, GetTreeMediaChildrenData, GetTreeMediaChildrenResponse, GetTreeMediaRootData, GetTreeMediaRootResponse, GetItemMemberGroupData, GetItemMemberGroupResponse, GetMemberGroupData, GetMemberGroupResponse, PostMemberGroupData, PostMemberGroupResponse, GetMemberGroupByIdData, GetMemberGroupByIdResponse, DeleteMemberGroupByIdData, DeleteMemberGroupByIdResponse, PutMemberGroupByIdData, PutMemberGroupByIdResponse, GetTreeMemberGroupRootData, GetTreeMemberGroupRootResponse, GetItemMemberTypeData, GetItemMemberTypeResponse, GetItemMemberTypeSearchData, GetItemMemberTypeSearchResponse, PostMemberTypeData, PostMemberTypeResponse, GetMemberTypeByIdData, GetMemberTypeByIdResponse, DeleteMemberTypeByIdData, DeleteMemberTypeByIdResponse, PutMemberTypeByIdData, PutMemberTypeByIdResponse, GetMemberTypeByIdCompositionReferencesData, GetMemberTypeByIdCompositionReferencesResponse, PostMemberTypeByIdCopyData, PostMemberTypeByIdCopyResponse, PostMemberTypeAvailableCompositionsData, PostMemberTypeAvailableCompositionsResponse, GetMemberTypeConfigurationResponse, GetTreeMemberTypeRootData, GetTreeMemberTypeRootResponse, GetFilterMemberData, GetFilterMemberResponse, GetItemMemberData, GetItemMemberResponse, GetItemMemberSearchData, GetItemMemberSearchResponse, PostMemberData, PostMemberResponse, GetMemberByIdData, GetMemberByIdResponse, DeleteMemberByIdData, DeleteMemberByIdResponse, PutMemberByIdData, PutMemberByIdResponse, PutMemberByIdValidateData, PutMemberByIdValidateResponse, GetMemberConfigurationResponse, PostMemberValidateData, PostMemberValidateResponse, PostModelsBuilderBuildResponse, GetModelsBuilderDashboardResponse, GetModelsBuilderStatusResponse, GetObjectTypesData, GetObjectTypesResponse, GetOembedQueryData, GetOembedQueryResponse, PostPackageByNameRunMigrationData, PostPackageByNameRunMigrationResponse, GetPackageConfigurationResponse, GetPackageCreatedData, GetPackageCreatedResponse, PostPackageCreatedData, PostPackageCreatedResponse, GetPackageCreatedByIdData, GetPackageCreatedByIdResponse, DeletePackageCreatedByIdData, DeletePackageCreatedByIdResponse, PutPackageCreatedByIdData, PutPackageCreatedByIdResponse, GetPackageCreatedByIdDownloadData, GetPackageCreatedByIdDownloadResponse, GetPackageMigrationStatusData, GetPackageMigrationStatusResponse, GetItemPartialViewData, GetItemPartialViewResponse, PostPartialViewData, PostPartialViewResponse, GetPartialViewByPathData, GetPartialViewByPathResponse, DeletePartialViewByPathData, DeletePartialViewByPathResponse, PutPartialViewByPathData, PutPartialViewByPathResponse, PutPartialViewByPathRenameData, PutPartialViewByPathRenameResponse, PostPartialViewFolderData, PostPartialViewFolderResponse, GetPartialViewFolderByPathData, GetPartialViewFolderByPathResponse, DeletePartialViewFolderByPathData, DeletePartialViewFolderByPathResponse, GetPartialViewSnippetData, GetPartialViewSnippetResponse, GetPartialViewSnippetByIdData, GetPartialViewSnippetByIdResponse, GetTreePartialViewAncestorsData, GetTreePartialViewAncestorsResponse, GetTreePartialViewChildrenData, GetTreePartialViewChildrenResponse, GetTreePartialViewRootData, GetTreePartialViewRootResponse, DeletePreviewResponse, PostPreviewResponse, GetProfilingStatusResponse, PutProfilingStatusData, PutProfilingStatusResponse, GetPropertyTypeIsUsedData, GetPropertyTypeIsUsedResponse, PostPublishedCacheCollectResponse, PostPublishedCacheRebuildResponse, PostPublishedCacheReloadResponse, GetPublishedCacheStatusResponse, GetRedirectManagementData, GetRedirectManagementResponse, GetRedirectManagementByIdData, GetRedirectManagementByIdResponse, DeleteRedirectManagementByIdData, DeleteRedirectManagementByIdResponse, GetRedirectManagementStatusResponse, PostRedirectManagementStatusData, PostRedirectManagementStatusResponse, GetItemRelationTypeData, GetItemRelationTypeResponse, GetRelationTypeData, GetRelationTypeResponse, GetRelationTypeByIdData, GetRelationTypeByIdResponse, GetRelationByRelationTypeIdData, GetRelationByRelationTypeIdResponse, GetItemScriptData, GetItemScriptResponse, PostScriptData, PostScriptResponse, GetScriptByPathData, GetScriptByPathResponse, DeleteScriptByPathData, DeleteScriptByPathResponse, PutScriptByPathData, PutScriptByPathResponse, PutScriptByPathRenameData, PutScriptByPathRenameResponse, PostScriptFolderData, PostScriptFolderResponse, GetScriptFolderByPathData, GetScriptFolderByPathResponse, DeleteScriptFolderByPathData, DeleteScriptFolderByPathResponse, GetTreeScriptAncestorsData, GetTreeScriptAncestorsResponse, GetTreeScriptChildrenData, GetTreeScriptChildrenResponse, GetTreeScriptRootData, GetTreeScriptRootResponse, GetSearcherData, GetSearcherResponse, GetSearcherBySearcherNameQueryData, GetSearcherBySearcherNameQueryResponse, GetSecurityConfigurationResponse, PostSecurityForgotPasswordData, PostSecurityForgotPasswordResponse, PostSecurityForgotPasswordResetData, PostSecurityForgotPasswordResetResponse, PostSecurityForgotPasswordVerifyData, PostSecurityForgotPasswordVerifyResponse, GetSegmentData, GetSegmentResponse, GetServerConfigurationResponse, GetServerInformationResponse, GetServerStatusResponse, GetServerTroubleshootingResponse, GetItemStaticFileData, GetItemStaticFileResponse, GetTreeStaticFileAncestorsData, GetTreeStaticFileAncestorsResponse, GetTreeStaticFileChildrenData, GetTreeStaticFileChildrenResponse, GetTreeStaticFileRootData, GetTreeStaticFileRootResponse, GetItemStylesheetData, GetItemStylesheetResponse, PostStylesheetData, PostStylesheetResponse, GetStylesheetByPathData, GetStylesheetByPathResponse, DeleteStylesheetByPathData, DeleteStylesheetByPathResponse, PutStylesheetByPathData, PutStylesheetByPathResponse, PutStylesheetByPathRenameData, PutStylesheetByPathRenameResponse, PostStylesheetFolderData, PostStylesheetFolderResponse, GetStylesheetFolderByPathData, GetStylesheetFolderByPathResponse, DeleteStylesheetFolderByPathData, DeleteStylesheetFolderByPathResponse, GetTreeStylesheetAncestorsData, GetTreeStylesheetAncestorsResponse, GetTreeStylesheetChildrenData, GetTreeStylesheetChildrenResponse, GetTreeStylesheetRootData, GetTreeStylesheetRootResponse, GetTagData, GetTagResponse, GetTelemetryData, GetTelemetryResponse, GetTelemetryLevelResponse, PostTelemetryLevelData, PostTelemetryLevelResponse, GetItemTemplateData, GetItemTemplateResponse, GetItemTemplateSearchData, GetItemTemplateSearchResponse, PostTemplateData, PostTemplateResponse, GetTemplateByIdData, GetTemplateByIdResponse, DeleteTemplateByIdData, DeleteTemplateByIdResponse, PutTemplateByIdData, PutTemplateByIdResponse, GetTemplateConfigurationResponse, PostTemplateQueryExecuteData, PostTemplateQueryExecuteResponse, GetTemplateQuerySettingsResponse, GetTreeTemplateAncestorsData, GetTreeTemplateAncestorsResponse, GetTreeTemplateChildrenData, GetTreeTemplateChildrenResponse, GetTreeTemplateRootData, GetTreeTemplateRootResponse, PostTemporaryFileData, PostTemporaryFileResponse, GetTemporaryFileByIdData, GetTemporaryFileByIdResponse, DeleteTemporaryFileByIdData, DeleteTemporaryFileByIdResponse, GetTemporaryFileConfigurationResponse, PostUpgradeAuthorizeResponse, GetUpgradeSettingsResponse, PostUserDataData, PostUserDataResponse, GetUserDataData, GetUserDataResponse, PutUserDataData, PutUserDataResponse, GetUserDataByIdData, GetUserDataByIdResponse, GetFilterUserGroupData, GetFilterUserGroupResponse, GetItemUserGroupData, GetItemUserGroupResponse, DeleteUserGroupData, DeleteUserGroupResponse, PostUserGroupData, PostUserGroupResponse, GetUserGroupData, GetUserGroupResponse, GetUserGroupByIdData, GetUserGroupByIdResponse, DeleteUserGroupByIdData, DeleteUserGroupByIdResponse, PutUserGroupByIdData, PutUserGroupByIdResponse, DeleteUserGroupByIdUsersData, DeleteUserGroupByIdUsersResponse, PostUserGroupByIdUsersData, PostUserGroupByIdUsersResponse, GetFilterUserData, GetFilterUserResponse, GetItemUserData, GetItemUserResponse, PostUserData, PostUserResponse, DeleteUserData, DeleteUserResponse, GetUserData, GetUserResponse, GetUserByIdData, GetUserByIdResponse, DeleteUserByIdData, DeleteUserByIdResponse, PutUserByIdData, PutUserByIdResponse, GetUserById2FaData, GetUserById2FaResponse, DeleteUserById2FaByProviderNameData, DeleteUserById2FaByProviderNameResponse, GetUserByIdCalculateStartNodesData, GetUserByIdCalculateStartNodesResponse, PostUserByIdChangePasswordData, PostUserByIdChangePasswordResponse, PostUserByIdResetPasswordData, PostUserByIdResetPasswordResponse, DeleteUserAvatarByIdData, DeleteUserAvatarByIdResponse, PostUserAvatarByIdData, PostUserAvatarByIdResponse, GetUserConfigurationResponse, GetUserCurrentResponse, GetUserCurrent2FaResponse, DeleteUserCurrent2FaByProviderNameData, DeleteUserCurrent2FaByProviderNameResponse, PostUserCurrent2FaByProviderNameData, PostUserCurrent2FaByProviderNameResponse, GetUserCurrent2FaByProviderNameData, GetUserCurrent2FaByProviderNameResponse, PostUserCurrentAvatarData, PostUserCurrentAvatarResponse, PostUserCurrentChangePasswordData, PostUserCurrentChangePasswordResponse, GetUserCurrentConfigurationResponse, GetUserCurrentLoginProvidersResponse, GetUserCurrentPermissionsData, GetUserCurrentPermissionsResponse, GetUserCurrentPermissionsDocumentData, GetUserCurrentPermissionsDocumentResponse, GetUserCurrentPermissionsMediaData, GetUserCurrentPermissionsMediaResponse, PostUserDisableData, PostUserDisableResponse, PostUserEnableData, PostUserEnableResponse, PostUserInviteData, PostUserInviteResponse, PostUserInviteCreatePasswordData, PostUserInviteCreatePasswordResponse, PostUserInviteResendData, PostUserInviteResendResponse, PostUserInviteVerifyData, PostUserInviteVerifyResponse, PostUserSetUserGroupsData, PostUserSetUserGroupsResponse, PostUserUnlockData, PostUserUnlockResponse, GetItemWebhookData, GetItemWebhookResponse, GetWebhookData, GetWebhookResponse, PostWebhookData, PostWebhookResponse, GetWebhookByIdData, GetWebhookByIdResponse, DeleteWebhookByIdData, DeleteWebhookByIdResponse, PutWebhookByIdData, PutWebhookByIdResponse, GetWebhookEventsData, GetWebhookEventsResponse } from './types.gen'; +import type { GetCultureData, GetCultureResponse, PostDataTypeData, PostDataTypeResponse, GetDataTypeByIdData, GetDataTypeByIdResponse, DeleteDataTypeByIdData, DeleteDataTypeByIdResponse, PutDataTypeByIdData, PutDataTypeByIdResponse, PostDataTypeByIdCopyData, PostDataTypeByIdCopyResponse, GetDataTypeByIdIsUsedData, GetDataTypeByIdIsUsedResponse, PutDataTypeByIdMoveData, PutDataTypeByIdMoveResponse, GetDataTypeByIdReferencesData, GetDataTypeByIdReferencesResponse, GetDataTypeConfigurationResponse, PostDataTypeFolderData, PostDataTypeFolderResponse, GetDataTypeFolderByIdData, GetDataTypeFolderByIdResponse, DeleteDataTypeFolderByIdData, DeleteDataTypeFolderByIdResponse, PutDataTypeFolderByIdData, PutDataTypeFolderByIdResponse, GetFilterDataTypeData, GetFilterDataTypeResponse, GetItemDataTypeData, GetItemDataTypeResponse, GetItemDataTypeSearchData, GetItemDataTypeSearchResponse, GetTreeDataTypeAncestorsData, GetTreeDataTypeAncestorsResponse, GetTreeDataTypeChildrenData, GetTreeDataTypeChildrenResponse, GetTreeDataTypeRootData, GetTreeDataTypeRootResponse, GetDictionaryData, GetDictionaryResponse, PostDictionaryData, PostDictionaryResponse, GetDictionaryByIdData, GetDictionaryByIdResponse, DeleteDictionaryByIdData, DeleteDictionaryByIdResponse, PutDictionaryByIdData, PutDictionaryByIdResponse, GetDictionaryByIdExportData, GetDictionaryByIdExportResponse, PutDictionaryByIdMoveData, PutDictionaryByIdMoveResponse, PostDictionaryImportData, PostDictionaryImportResponse, GetItemDictionaryData, GetItemDictionaryResponse, GetTreeDictionaryAncestorsData, GetTreeDictionaryAncestorsResponse, GetTreeDictionaryChildrenData, GetTreeDictionaryChildrenResponse, GetTreeDictionaryRootData, GetTreeDictionaryRootResponse, PostDocumentBlueprintData, PostDocumentBlueprintResponse, GetDocumentBlueprintByIdData, GetDocumentBlueprintByIdResponse, DeleteDocumentBlueprintByIdData, DeleteDocumentBlueprintByIdResponse, PutDocumentBlueprintByIdData, PutDocumentBlueprintByIdResponse, PutDocumentBlueprintByIdMoveData, PutDocumentBlueprintByIdMoveResponse, PostDocumentBlueprintFolderData, PostDocumentBlueprintFolderResponse, GetDocumentBlueprintFolderByIdData, GetDocumentBlueprintFolderByIdResponse, DeleteDocumentBlueprintFolderByIdData, DeleteDocumentBlueprintFolderByIdResponse, PutDocumentBlueprintFolderByIdData, PutDocumentBlueprintFolderByIdResponse, PostDocumentBlueprintFromDocumentData, PostDocumentBlueprintFromDocumentResponse, GetItemDocumentBlueprintData, GetItemDocumentBlueprintResponse, GetTreeDocumentBlueprintAncestorsData, GetTreeDocumentBlueprintAncestorsResponse, GetTreeDocumentBlueprintChildrenData, GetTreeDocumentBlueprintChildrenResponse, GetTreeDocumentBlueprintRootData, GetTreeDocumentBlueprintRootResponse, PostDocumentTypeData, PostDocumentTypeResponse, GetDocumentTypeByIdData, GetDocumentTypeByIdResponse, DeleteDocumentTypeByIdData, DeleteDocumentTypeByIdResponse, PutDocumentTypeByIdData, PutDocumentTypeByIdResponse, GetDocumentTypeByIdAllowedChildrenData, GetDocumentTypeByIdAllowedChildrenResponse, GetDocumentTypeByIdBlueprintData, GetDocumentTypeByIdBlueprintResponse, GetDocumentTypeByIdCompositionReferencesData, GetDocumentTypeByIdCompositionReferencesResponse, PostDocumentTypeByIdCopyData, PostDocumentTypeByIdCopyResponse, GetDocumentTypeByIdExportData, GetDocumentTypeByIdExportResponse, PutDocumentTypeByIdImportData, PutDocumentTypeByIdImportResponse, PutDocumentTypeByIdMoveData, PutDocumentTypeByIdMoveResponse, GetDocumentTypeAllowedAtRootData, GetDocumentTypeAllowedAtRootResponse, PostDocumentTypeAvailableCompositionsData, PostDocumentTypeAvailableCompositionsResponse, GetDocumentTypeConfigurationResponse, PostDocumentTypeFolderData, PostDocumentTypeFolderResponse, GetDocumentTypeFolderByIdData, GetDocumentTypeFolderByIdResponse, DeleteDocumentTypeFolderByIdData, DeleteDocumentTypeFolderByIdResponse, PutDocumentTypeFolderByIdData, PutDocumentTypeFolderByIdResponse, PostDocumentTypeImportData, PostDocumentTypeImportResponse, GetItemDocumentTypeData, GetItemDocumentTypeResponse, GetItemDocumentTypeSearchData, GetItemDocumentTypeSearchResponse, GetTreeDocumentTypeAncestorsData, GetTreeDocumentTypeAncestorsResponse, GetTreeDocumentTypeChildrenData, GetTreeDocumentTypeChildrenResponse, GetTreeDocumentTypeRootData, GetTreeDocumentTypeRootResponse, GetDocumentVersionData, GetDocumentVersionResponse, GetDocumentVersionByIdData, GetDocumentVersionByIdResponse, PutDocumentVersionByIdPreventCleanupData, PutDocumentVersionByIdPreventCleanupResponse, PostDocumentVersionByIdRollbackData, PostDocumentVersionByIdRollbackResponse, GetCollectionDocumentByIdData, GetCollectionDocumentByIdResponse, PostDocumentData, PostDocumentResponse, GetDocumentByIdData, GetDocumentByIdResponse, DeleteDocumentByIdData, DeleteDocumentByIdResponse, PutDocumentByIdData, PutDocumentByIdResponse, GetDocumentByIdAuditLogData, GetDocumentByIdAuditLogResponse, PostDocumentByIdCopyData, PostDocumentByIdCopyResponse, GetDocumentByIdDomainsData, GetDocumentByIdDomainsResponse, PutDocumentByIdDomainsData, PutDocumentByIdDomainsResponse, PutDocumentByIdMoveData, PutDocumentByIdMoveResponse, PutDocumentByIdMoveToRecycleBinData, PutDocumentByIdMoveToRecycleBinResponse, GetDocumentByIdNotificationsData, GetDocumentByIdNotificationsResponse, PutDocumentByIdNotificationsData, PutDocumentByIdNotificationsResponse, PostDocumentByIdPublicAccessData, PostDocumentByIdPublicAccessResponse, DeleteDocumentByIdPublicAccessData, DeleteDocumentByIdPublicAccessResponse, GetDocumentByIdPublicAccessData, GetDocumentByIdPublicAccessResponse, PutDocumentByIdPublicAccessData, PutDocumentByIdPublicAccessResponse, PutDocumentByIdPublishData, PutDocumentByIdPublishResponse, PutDocumentByIdPublishWithDescendantsData, PutDocumentByIdPublishWithDescendantsResponse, GetDocumentByIdReferencedByData, GetDocumentByIdReferencedByResponse, GetDocumentByIdReferencedDescendantsData, GetDocumentByIdReferencedDescendantsResponse, PutDocumentByIdUnpublishData, PutDocumentByIdUnpublishResponse, PutDocumentByIdValidateData, PutDocumentByIdValidateResponse, GetDocumentAreReferencedData, GetDocumentAreReferencedResponse, GetDocumentConfigurationResponse, PutDocumentSortData, PutDocumentSortResponse, GetDocumentUrlsData, GetDocumentUrlsResponse, PostDocumentValidateData, PostDocumentValidateResponse, GetItemDocumentData, GetItemDocumentResponse, GetItemDocumentSearchData, GetItemDocumentSearchResponse, DeleteRecycleBinDocumentResponse, DeleteRecycleBinDocumentByIdData, DeleteRecycleBinDocumentByIdResponse, GetRecycleBinDocumentByIdOriginalParentData, GetRecycleBinDocumentByIdOriginalParentResponse, PutRecycleBinDocumentByIdRestoreData, PutRecycleBinDocumentByIdRestoreResponse, GetRecycleBinDocumentChildrenData, GetRecycleBinDocumentChildrenResponse, GetRecycleBinDocumentRootData, GetRecycleBinDocumentRootResponse, GetTreeDocumentAncestorsData, GetTreeDocumentAncestorsResponse, GetTreeDocumentChildrenData, GetTreeDocumentChildrenResponse, GetTreeDocumentRootData, GetTreeDocumentRootResponse, PostDynamicRootQueryData, PostDynamicRootQueryResponse, GetDynamicRootStepsResponse, GetHealthCheckGroupData, GetHealthCheckGroupResponse, GetHealthCheckGroupByNameData, GetHealthCheckGroupByNameResponse, PostHealthCheckGroupByNameCheckData, PostHealthCheckGroupByNameCheckResponse, PostHealthCheckExecuteActionData, PostHealthCheckExecuteActionResponse, GetHelpData, GetHelpResponse, GetImagingResizeUrlsData, GetImagingResizeUrlsResponse, GetImportAnalyzeData, GetImportAnalyzeResponse, GetIndexerData, GetIndexerResponse, GetIndexerByIndexNameData, GetIndexerByIndexNameResponse, PostIndexerByIndexNameRebuildData, PostIndexerByIndexNameRebuildResponse, GetInstallSettingsResponse, PostInstallSetupData, PostInstallSetupResponse, PostInstallValidateDatabaseData, PostInstallValidateDatabaseResponse, GetItemLanguageData, GetItemLanguageResponse, GetItemLanguageDefaultResponse, GetLanguageData, GetLanguageResponse, PostLanguageData, PostLanguageResponse, GetLanguageByIsoCodeData, GetLanguageByIsoCodeResponse, DeleteLanguageByIsoCodeData, DeleteLanguageByIsoCodeResponse, PutLanguageByIsoCodeData, PutLanguageByIsoCodeResponse, GetLogViewerLevelData, GetLogViewerLevelResponse, GetLogViewerLevelCountData, GetLogViewerLevelCountResponse, GetLogViewerLogData, GetLogViewerLogResponse, GetLogViewerMessageTemplateData, GetLogViewerMessageTemplateResponse, GetLogViewerSavedSearchData, GetLogViewerSavedSearchResponse, PostLogViewerSavedSearchData, PostLogViewerSavedSearchResponse, GetLogViewerSavedSearchByNameData, GetLogViewerSavedSearchByNameResponse, DeleteLogViewerSavedSearchByNameData, DeleteLogViewerSavedSearchByNameResponse, GetLogViewerValidateLogsSizeData, GetLogViewerValidateLogsSizeResponse, GetManifestManifestResponse, GetManifestManifestPrivateResponse, GetManifestManifestPublicResponse, GetItemMediaTypeData, GetItemMediaTypeResponse, GetItemMediaTypeAllowedData, GetItemMediaTypeAllowedResponse, GetItemMediaTypeFoldersData, GetItemMediaTypeFoldersResponse, GetItemMediaTypeSearchData, GetItemMediaTypeSearchResponse, PostMediaTypeData, PostMediaTypeResponse, GetMediaTypeByIdData, GetMediaTypeByIdResponse, DeleteMediaTypeByIdData, DeleteMediaTypeByIdResponse, PutMediaTypeByIdData, PutMediaTypeByIdResponse, GetMediaTypeByIdAllowedChildrenData, GetMediaTypeByIdAllowedChildrenResponse, GetMediaTypeByIdCompositionReferencesData, GetMediaTypeByIdCompositionReferencesResponse, PostMediaTypeByIdCopyData, PostMediaTypeByIdCopyResponse, GetMediaTypeByIdExportData, GetMediaTypeByIdExportResponse, PutMediaTypeByIdImportData, PutMediaTypeByIdImportResponse, PutMediaTypeByIdMoveData, PutMediaTypeByIdMoveResponse, GetMediaTypeAllowedAtRootData, GetMediaTypeAllowedAtRootResponse, PostMediaTypeAvailableCompositionsData, PostMediaTypeAvailableCompositionsResponse, GetMediaTypeConfigurationResponse, PostMediaTypeFolderData, PostMediaTypeFolderResponse, GetMediaTypeFolderByIdData, GetMediaTypeFolderByIdResponse, DeleteMediaTypeFolderByIdData, DeleteMediaTypeFolderByIdResponse, PutMediaTypeFolderByIdData, PutMediaTypeFolderByIdResponse, PostMediaTypeImportData, PostMediaTypeImportResponse, GetTreeMediaTypeAncestorsData, GetTreeMediaTypeAncestorsResponse, GetTreeMediaTypeChildrenData, GetTreeMediaTypeChildrenResponse, GetTreeMediaTypeRootData, GetTreeMediaTypeRootResponse, GetCollectionMediaData, GetCollectionMediaResponse, GetItemMediaData, GetItemMediaResponse, GetItemMediaSearchData, GetItemMediaSearchResponse, PostMediaData, PostMediaResponse, GetMediaByIdData, GetMediaByIdResponse, DeleteMediaByIdData, DeleteMediaByIdResponse, PutMediaByIdData, PutMediaByIdResponse, GetMediaByIdAuditLogData, GetMediaByIdAuditLogResponse, PutMediaByIdMoveData, PutMediaByIdMoveResponse, PutMediaByIdMoveToRecycleBinData, PutMediaByIdMoveToRecycleBinResponse, GetMediaByIdReferencedByData, GetMediaByIdReferencedByResponse, GetMediaByIdReferencedDescendantsData, GetMediaByIdReferencedDescendantsResponse, PutMediaByIdValidateData, PutMediaByIdValidateResponse, GetMediaAreReferencedData, GetMediaAreReferencedResponse, GetMediaConfigurationResponse, PutMediaSortData, PutMediaSortResponse, GetMediaUrlsData, GetMediaUrlsResponse, PostMediaValidateData, PostMediaValidateResponse, DeleteRecycleBinMediaResponse, DeleteRecycleBinMediaByIdData, DeleteRecycleBinMediaByIdResponse, GetRecycleBinMediaByIdOriginalParentData, GetRecycleBinMediaByIdOriginalParentResponse, PutRecycleBinMediaByIdRestoreData, PutRecycleBinMediaByIdRestoreResponse, GetRecycleBinMediaChildrenData, GetRecycleBinMediaChildrenResponse, GetRecycleBinMediaRootData, GetRecycleBinMediaRootResponse, GetTreeMediaAncestorsData, GetTreeMediaAncestorsResponse, GetTreeMediaChildrenData, GetTreeMediaChildrenResponse, GetTreeMediaRootData, GetTreeMediaRootResponse, GetItemMemberGroupData, GetItemMemberGroupResponse, GetMemberGroupData, GetMemberGroupResponse, PostMemberGroupData, PostMemberGroupResponse, GetMemberGroupByIdData, GetMemberGroupByIdResponse, DeleteMemberGroupByIdData, DeleteMemberGroupByIdResponse, PutMemberGroupByIdData, PutMemberGroupByIdResponse, GetTreeMemberGroupRootData, GetTreeMemberGroupRootResponse, GetItemMemberTypeData, GetItemMemberTypeResponse, GetItemMemberTypeSearchData, GetItemMemberTypeSearchResponse, PostMemberTypeData, PostMemberTypeResponse, GetMemberTypeByIdData, GetMemberTypeByIdResponse, DeleteMemberTypeByIdData, DeleteMemberTypeByIdResponse, PutMemberTypeByIdData, PutMemberTypeByIdResponse, GetMemberTypeByIdCompositionReferencesData, GetMemberTypeByIdCompositionReferencesResponse, PostMemberTypeByIdCopyData, PostMemberTypeByIdCopyResponse, PostMemberTypeAvailableCompositionsData, PostMemberTypeAvailableCompositionsResponse, GetMemberTypeConfigurationResponse, GetTreeMemberTypeRootData, GetTreeMemberTypeRootResponse, GetFilterMemberData, GetFilterMemberResponse, GetItemMemberData, GetItemMemberResponse, GetItemMemberSearchData, GetItemMemberSearchResponse, PostMemberData, PostMemberResponse, GetMemberByIdData, GetMemberByIdResponse, DeleteMemberByIdData, DeleteMemberByIdResponse, PutMemberByIdData, PutMemberByIdResponse, PutMemberByIdValidateData, PutMemberByIdValidateResponse, GetMemberConfigurationResponse, PostMemberValidateData, PostMemberValidateResponse, PostModelsBuilderBuildResponse, GetModelsBuilderDashboardResponse, GetModelsBuilderStatusResponse, GetObjectTypesData, GetObjectTypesResponse, GetOembedQueryData, GetOembedQueryResponse, PostPackageByNameRunMigrationData, PostPackageByNameRunMigrationResponse, GetPackageConfigurationResponse, GetPackageCreatedData, GetPackageCreatedResponse, PostPackageCreatedData, PostPackageCreatedResponse, GetPackageCreatedByIdData, GetPackageCreatedByIdResponse, DeletePackageCreatedByIdData, DeletePackageCreatedByIdResponse, PutPackageCreatedByIdData, PutPackageCreatedByIdResponse, GetPackageCreatedByIdDownloadData, GetPackageCreatedByIdDownloadResponse, GetPackageMigrationStatusData, GetPackageMigrationStatusResponse, GetItemPartialViewData, GetItemPartialViewResponse, PostPartialViewData, PostPartialViewResponse, GetPartialViewByPathData, GetPartialViewByPathResponse, DeletePartialViewByPathData, DeletePartialViewByPathResponse, PutPartialViewByPathData, PutPartialViewByPathResponse, PutPartialViewByPathRenameData, PutPartialViewByPathRenameResponse, PostPartialViewFolderData, PostPartialViewFolderResponse, GetPartialViewFolderByPathData, GetPartialViewFolderByPathResponse, DeletePartialViewFolderByPathData, DeletePartialViewFolderByPathResponse, GetPartialViewSnippetData, GetPartialViewSnippetResponse, GetPartialViewSnippetByIdData, GetPartialViewSnippetByIdResponse, GetTreePartialViewAncestorsData, GetTreePartialViewAncestorsResponse, GetTreePartialViewChildrenData, GetTreePartialViewChildrenResponse, GetTreePartialViewRootData, GetTreePartialViewRootResponse, DeletePreviewResponse, PostPreviewResponse, GetProfilingStatusResponse, PutProfilingStatusData, PutProfilingStatusResponse, GetPropertyTypeIsUsedData, GetPropertyTypeIsUsedResponse, PostPublishedCacheCollectResponse, PostPublishedCacheRebuildResponse, PostPublishedCacheReloadResponse, GetPublishedCacheStatusResponse, GetRedirectManagementData, GetRedirectManagementResponse, GetRedirectManagementByIdData, GetRedirectManagementByIdResponse, DeleteRedirectManagementByIdData, DeleteRedirectManagementByIdResponse, GetRedirectManagementStatusResponse, PostRedirectManagementStatusData, PostRedirectManagementStatusResponse, GetItemRelationTypeData, GetItemRelationTypeResponse, GetRelationTypeData, GetRelationTypeResponse, GetRelationTypeByIdData, GetRelationTypeByIdResponse, GetRelationByRelationTypeIdData, GetRelationByRelationTypeIdResponse, GetItemScriptData, GetItemScriptResponse, PostScriptData, PostScriptResponse, GetScriptByPathData, GetScriptByPathResponse, DeleteScriptByPathData, DeleteScriptByPathResponse, PutScriptByPathData, PutScriptByPathResponse, PutScriptByPathRenameData, PutScriptByPathRenameResponse, PostScriptFolderData, PostScriptFolderResponse, GetScriptFolderByPathData, GetScriptFolderByPathResponse, DeleteScriptFolderByPathData, DeleteScriptFolderByPathResponse, GetTreeScriptAncestorsData, GetTreeScriptAncestorsResponse, GetTreeScriptChildrenData, GetTreeScriptChildrenResponse, GetTreeScriptRootData, GetTreeScriptRootResponse, GetSearcherData, GetSearcherResponse, GetSearcherBySearcherNameQueryData, GetSearcherBySearcherNameQueryResponse, GetSecurityConfigurationResponse, PostSecurityForgotPasswordData, PostSecurityForgotPasswordResponse, PostSecurityForgotPasswordResetData, PostSecurityForgotPasswordResetResponse, PostSecurityForgotPasswordVerifyData, PostSecurityForgotPasswordVerifyResponse, GetSegmentData, GetSegmentResponse, GetServerConfigurationResponse, GetServerInformationResponse, GetServerStatusResponse, GetServerTroubleshootingResponse, GetServerUpgradeCheckResponse, GetItemStaticFileData, GetItemStaticFileResponse, GetTreeStaticFileAncestorsData, GetTreeStaticFileAncestorsResponse, GetTreeStaticFileChildrenData, GetTreeStaticFileChildrenResponse, GetTreeStaticFileRootData, GetTreeStaticFileRootResponse, GetItemStylesheetData, GetItemStylesheetResponse, PostStylesheetData, PostStylesheetResponse, GetStylesheetByPathData, GetStylesheetByPathResponse, DeleteStylesheetByPathData, DeleteStylesheetByPathResponse, PutStylesheetByPathData, PutStylesheetByPathResponse, PutStylesheetByPathRenameData, PutStylesheetByPathRenameResponse, PostStylesheetFolderData, PostStylesheetFolderResponse, GetStylesheetFolderByPathData, GetStylesheetFolderByPathResponse, DeleteStylesheetFolderByPathData, DeleteStylesheetFolderByPathResponse, GetTreeStylesheetAncestorsData, GetTreeStylesheetAncestorsResponse, GetTreeStylesheetChildrenData, GetTreeStylesheetChildrenResponse, GetTreeStylesheetRootData, GetTreeStylesheetRootResponse, GetTagData, GetTagResponse, GetTelemetryData, GetTelemetryResponse, GetTelemetryLevelResponse, PostTelemetryLevelData, PostTelemetryLevelResponse, GetItemTemplateData, GetItemTemplateResponse, GetItemTemplateSearchData, GetItemTemplateSearchResponse, PostTemplateData, PostTemplateResponse, GetTemplateByIdData, GetTemplateByIdResponse, DeleteTemplateByIdData, DeleteTemplateByIdResponse, PutTemplateByIdData, PutTemplateByIdResponse, GetTemplateConfigurationResponse, PostTemplateQueryExecuteData, PostTemplateQueryExecuteResponse, GetTemplateQuerySettingsResponse, GetTreeTemplateAncestorsData, GetTreeTemplateAncestorsResponse, GetTreeTemplateChildrenData, GetTreeTemplateChildrenResponse, GetTreeTemplateRootData, GetTreeTemplateRootResponse, PostTemporaryFileData, PostTemporaryFileResponse, GetTemporaryFileByIdData, GetTemporaryFileByIdResponse, DeleteTemporaryFileByIdData, DeleteTemporaryFileByIdResponse, GetTemporaryFileConfigurationResponse, PostUpgradeAuthorizeResponse, GetUpgradeSettingsResponse, PostUserDataData, PostUserDataResponse, GetUserDataData, GetUserDataResponse, PutUserDataData, PutUserDataResponse, GetUserDataByIdData, GetUserDataByIdResponse, GetFilterUserGroupData, GetFilterUserGroupResponse, GetItemUserGroupData, GetItemUserGroupResponse, DeleteUserGroupData, DeleteUserGroupResponse, PostUserGroupData, PostUserGroupResponse, GetUserGroupData, GetUserGroupResponse, GetUserGroupByIdData, GetUserGroupByIdResponse, DeleteUserGroupByIdData, DeleteUserGroupByIdResponse, PutUserGroupByIdData, PutUserGroupByIdResponse, DeleteUserGroupByIdUsersData, DeleteUserGroupByIdUsersResponse, PostUserGroupByIdUsersData, PostUserGroupByIdUsersResponse, GetFilterUserData, GetFilterUserResponse, GetItemUserData, GetItemUserResponse, PostUserData, PostUserResponse, DeleteUserData, DeleteUserResponse, GetUserData, GetUserResponse, GetUserByIdData, GetUserByIdResponse, DeleteUserByIdData, DeleteUserByIdResponse, PutUserByIdData, PutUserByIdResponse, GetUserById2FaData, GetUserById2FaResponse, DeleteUserById2FaByProviderNameData, DeleteUserById2FaByProviderNameResponse, GetUserByIdCalculateStartNodesData, GetUserByIdCalculateStartNodesResponse, PostUserByIdChangePasswordData, PostUserByIdChangePasswordResponse, PostUserByIdResetPasswordData, PostUserByIdResetPasswordResponse, DeleteUserAvatarByIdData, DeleteUserAvatarByIdResponse, PostUserAvatarByIdData, PostUserAvatarByIdResponse, GetUserConfigurationResponse, GetUserCurrentResponse, GetUserCurrent2FaResponse, DeleteUserCurrent2FaByProviderNameData, DeleteUserCurrent2FaByProviderNameResponse, PostUserCurrent2FaByProviderNameData, PostUserCurrent2FaByProviderNameResponse, GetUserCurrent2FaByProviderNameData, GetUserCurrent2FaByProviderNameResponse, PostUserCurrentAvatarData, PostUserCurrentAvatarResponse, PostUserCurrentChangePasswordData, PostUserCurrentChangePasswordResponse, GetUserCurrentConfigurationResponse, GetUserCurrentLoginProvidersResponse, GetUserCurrentPermissionsData, GetUserCurrentPermissionsResponse, GetUserCurrentPermissionsDocumentData, GetUserCurrentPermissionsDocumentResponse, GetUserCurrentPermissionsMediaData, GetUserCurrentPermissionsMediaResponse, PostUserDisableData, PostUserDisableResponse, PostUserEnableData, PostUserEnableResponse, PostUserInviteData, PostUserInviteResponse, PostUserInviteCreatePasswordData, PostUserInviteCreatePasswordResponse, PostUserInviteResendData, PostUserInviteResendResponse, PostUserInviteVerifyData, PostUserInviteVerifyResponse, PostUserSetUserGroupsData, PostUserSetUserGroupsResponse, PostUserUnlockData, PostUserUnlockResponse, GetItemWebhookData, GetItemWebhookResponse, GetWebhookData, GetWebhookResponse, PostWebhookData, PostWebhookResponse, GetWebhookByIdData, GetWebhookByIdResponse, DeleteWebhookByIdData, DeleteWebhookByIdResponse, PutWebhookByIdData, PutWebhookByIdResponse, GetWebhookEventsData, GetWebhookEventsResponse } from './types.gen'; export class CultureService { /** @@ -6681,6 +6681,21 @@ export class ServerService { }); } + /** + * @returns unknown OK + * @throws ApiError + */ + public static getServerUpgradeCheck(): CancelablePromise { + return __request(OpenAPI, { + method: 'GET', + url: '/umbraco/management/api/v1/server/upgrade-check', + errors: { + 401: 'The resource is protected and requires an authentication token', + 403: 'The authenticated user do not have access to this resource' + } + }); + } + } export class StaticFileService { diff --git a/src/Umbraco.Web.UI.Client/src/external/backend-api/src/types.gen.ts b/src/Umbraco.Web.UI.Client/src/external/backend-api/src/types.gen.ts index 6a1ac2dca6..5a7d32f9f7 100644 --- a/src/Umbraco.Web.UI.Client/src/external/backend-api/src/types.gen.ts +++ b/src/Umbraco.Web.UI.Client/src/external/backend-api/src/types.gen.ts @@ -2149,6 +2149,7 @@ export type ServerConfigurationItemResponseModel = { export type ServerConfigurationResponseModel = { allowPasswordReset: boolean; + versionCheckPeriod: number; }; export type ServerInformationResponseModel = { @@ -2608,6 +2609,12 @@ export type UpdateWebhookRequestModel = { events: Array<(string)>; }; +export type UpgradeCheckResponseModel = { + type: string; + comment: string; + url: string; +}; + export type UpgradeSettingsResponseModel = { currentState: string; newState: string; @@ -4667,6 +4674,8 @@ export type GetServerStatusResponse = ((ServerStatusResponseModel)); export type GetServerTroubleshootingResponse = ((ServerTroubleshootingResponseModel)); +export type GetServerUpgradeCheckResponse = ((UpgradeCheckResponseModel)); + export type GetItemStaticFileData = { path?: Array<(string)>; }; From fed4f8a29e6436e579173fcb33bb4b1dde296306 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Thu, 12 Sep 2024 12:47:30 +0200 Subject: [PATCH 18/43] update dependency --- src/Umbraco.Web.UI.Client/package-lock.json | 956 ++++++++++---------- src/Umbraco.Web.UI.Client/package.json | 4 +- 2 files changed, 481 insertions(+), 479 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json index 9632640fa9..d2fe265460 100644 --- a/src/Umbraco.Web.UI.Client/package-lock.json +++ b/src/Umbraco.Web.UI.Client/package-lock.json @@ -15,8 +15,8 @@ "@types/diff": "^5.2.1", "@types/dompurify": "^3.0.5", "@types/uuid": "^10.0.0", - "@umbraco-ui/uui": "^1.9.0", - "@umbraco-ui/uui-css": "^1.9.0", + "@umbraco-ui/uui": "^v1.10.0-rc.0", + "@umbraco-ui/uui-css": "^v1.10.0-rc.0", "base64-js": "^1.5.1", "diff": "^5.2.0", "dompurify": "^3.1.6", @@ -7904,814 +7904,814 @@ "link": true }, "node_modules/@umbraco-ui/uui": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui/-/uui-1.9.0.tgz", - "integrity": "sha512-+Jr/TdvGfiVbVfYNZIDjozLvQ2C5pUVgTl41Z7kofrV31a0y9dzjOrJrB7PQQXKxYEbxg41SbZBhC3it7GA1og==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui/-/uui-1.10.0-rc.0.tgz", + "integrity": "sha512-8vDudDOVsBEBmNEbX5+W7FydeKOGlGqsS9unPAaz0YiHT3F+36UowqYyEnBp9ZWK8GBPWHE0aRkclW1DuVr62w==", "dependencies": { - "@umbraco-ui/uui-action-bar": "1.9.0", - "@umbraco-ui/uui-avatar": "1.9.0", - "@umbraco-ui/uui-avatar-group": "1.9.0", - "@umbraco-ui/uui-badge": "1.9.0", - "@umbraco-ui/uui-base": "1.9.0", - "@umbraco-ui/uui-boolean-input": "1.9.0", - "@umbraco-ui/uui-box": "1.9.0", - "@umbraco-ui/uui-breadcrumbs": "1.9.0", - "@umbraco-ui/uui-button": "1.9.0", - "@umbraco-ui/uui-button-group": "1.9.0", - "@umbraco-ui/uui-button-inline-create": "1.9.0", - "@umbraco-ui/uui-card": "1.9.0", - "@umbraco-ui/uui-card-block-type": "1.9.0", - "@umbraco-ui/uui-card-content-node": "1.9.0", - "@umbraco-ui/uui-card-media": "1.9.0", - "@umbraco-ui/uui-card-user": "1.9.0", - "@umbraco-ui/uui-caret": "1.9.0", - "@umbraco-ui/uui-checkbox": "1.9.0", - "@umbraco-ui/uui-color-area": "1.9.0", - "@umbraco-ui/uui-color-picker": "1.9.0", - "@umbraco-ui/uui-color-slider": "1.9.0", - "@umbraco-ui/uui-color-swatch": "1.9.0", - "@umbraco-ui/uui-color-swatches": "1.9.0", - "@umbraco-ui/uui-combobox": "1.9.0", - "@umbraco-ui/uui-combobox-list": "1.9.0", - "@umbraco-ui/uui-css": "1.9.0", - "@umbraco-ui/uui-dialog": "1.9.0", - "@umbraco-ui/uui-dialog-layout": "1.9.0", - "@umbraco-ui/uui-file-dropzone": "1.9.0", - "@umbraco-ui/uui-file-preview": "1.9.0", - "@umbraco-ui/uui-form": "1.9.0", - "@umbraco-ui/uui-form-layout-item": "1.9.0", - "@umbraco-ui/uui-form-validation-message": "1.9.0", - "@umbraco-ui/uui-icon": "1.9.0", - "@umbraco-ui/uui-icon-registry": "1.9.0", - "@umbraco-ui/uui-icon-registry-essential": "1.9.0", - "@umbraco-ui/uui-input": "1.9.0", - "@umbraco-ui/uui-input-file": "1.9.0", - "@umbraco-ui/uui-input-lock": "1.9.0", - "@umbraco-ui/uui-input-password": "1.9.0", - "@umbraco-ui/uui-keyboard-shortcut": "1.9.0", - "@umbraco-ui/uui-label": "1.9.0", - "@umbraco-ui/uui-loader": "1.9.0", - "@umbraco-ui/uui-loader-bar": "1.9.0", - "@umbraco-ui/uui-loader-circle": "1.9.0", - "@umbraco-ui/uui-menu-item": "1.9.0", - "@umbraco-ui/uui-modal": "1.9.0", - "@umbraco-ui/uui-pagination": "1.9.0", - "@umbraco-ui/uui-popover": "1.9.0", - "@umbraco-ui/uui-popover-container": "1.9.0", - "@umbraco-ui/uui-progress-bar": "1.9.0", - "@umbraco-ui/uui-radio": "1.9.0", - "@umbraco-ui/uui-range-slider": "1.9.0", - "@umbraco-ui/uui-ref": "1.9.0", - "@umbraco-ui/uui-ref-list": "1.9.0", - "@umbraco-ui/uui-ref-node": "1.9.0", - "@umbraco-ui/uui-ref-node-data-type": "1.9.0", - "@umbraco-ui/uui-ref-node-document-type": "1.9.0", - "@umbraco-ui/uui-ref-node-form": "1.9.0", - "@umbraco-ui/uui-ref-node-member": "1.9.0", - "@umbraco-ui/uui-ref-node-package": "1.9.0", - "@umbraco-ui/uui-ref-node-user": "1.9.0", - "@umbraco-ui/uui-scroll-container": "1.9.0", - "@umbraco-ui/uui-select": "1.9.0", - "@umbraco-ui/uui-slider": "1.9.0", - "@umbraco-ui/uui-symbol-expand": "1.9.0", - "@umbraco-ui/uui-symbol-file": "1.9.0", - "@umbraco-ui/uui-symbol-file-dropzone": "1.9.0", - "@umbraco-ui/uui-symbol-file-thumbnail": "1.9.0", - "@umbraco-ui/uui-symbol-folder": "1.9.0", - "@umbraco-ui/uui-symbol-lock": "1.9.0", - "@umbraco-ui/uui-symbol-more": "1.9.0", - "@umbraco-ui/uui-symbol-sort": "1.9.0", - "@umbraco-ui/uui-table": "1.9.0", - "@umbraco-ui/uui-tabs": "1.9.0", - "@umbraco-ui/uui-tag": "1.9.0", - "@umbraco-ui/uui-textarea": "1.9.0", - "@umbraco-ui/uui-toast-notification": "1.9.0", - "@umbraco-ui/uui-toast-notification-container": "1.9.0", - "@umbraco-ui/uui-toast-notification-layout": "1.9.0", - "@umbraco-ui/uui-toggle": "1.9.0", - "@umbraco-ui/uui-visually-hidden": "1.9.0" + "@umbraco-ui/uui-action-bar": "1.10.0-rc.0", + "@umbraco-ui/uui-avatar": "1.10.0-rc.0", + "@umbraco-ui/uui-avatar-group": "1.10.0-rc.0", + "@umbraco-ui/uui-badge": "1.10.0-rc.0", + "@umbraco-ui/uui-base": "1.10.0-rc.0", + "@umbraco-ui/uui-boolean-input": "1.10.0-rc.0", + "@umbraco-ui/uui-box": "1.10.0-rc.0", + "@umbraco-ui/uui-breadcrumbs": "1.10.0-rc.0", + "@umbraco-ui/uui-button": "1.10.0-rc.0", + "@umbraco-ui/uui-button-group": "1.10.0-rc.0", + "@umbraco-ui/uui-button-inline-create": "1.10.0-rc.0", + "@umbraco-ui/uui-card": "1.10.0-rc.0", + "@umbraco-ui/uui-card-block-type": "1.10.0-rc.0", + "@umbraco-ui/uui-card-content-node": "1.10.0-rc.0", + "@umbraco-ui/uui-card-media": "1.10.0-rc.0", + "@umbraco-ui/uui-card-user": "1.10.0-rc.0", + "@umbraco-ui/uui-caret": "1.10.0-rc.0", + "@umbraco-ui/uui-checkbox": "1.10.0-rc.0", + "@umbraco-ui/uui-color-area": "1.10.0-rc.0", + "@umbraco-ui/uui-color-picker": "1.10.0-rc.0", + "@umbraco-ui/uui-color-slider": "1.10.0-rc.0", + "@umbraco-ui/uui-color-swatch": "1.10.0-rc.0", + "@umbraco-ui/uui-color-swatches": "1.10.0-rc.0", + "@umbraco-ui/uui-combobox": "1.10.0-rc.0", + "@umbraco-ui/uui-combobox-list": "1.10.0-rc.0", + "@umbraco-ui/uui-css": "1.10.0-rc.0", + "@umbraco-ui/uui-dialog": "1.10.0-rc.0", + "@umbraco-ui/uui-dialog-layout": "1.10.0-rc.0", + "@umbraco-ui/uui-file-dropzone": "1.10.0-rc.0", + "@umbraco-ui/uui-file-preview": "1.10.0-rc.0", + "@umbraco-ui/uui-form": "1.10.0-rc.0", + "@umbraco-ui/uui-form-layout-item": "1.10.0-rc.0", + "@umbraco-ui/uui-form-validation-message": "1.10.0-rc.0", + "@umbraco-ui/uui-icon": "1.10.0-rc.0", + "@umbraco-ui/uui-icon-registry": "1.10.0-rc.0", + "@umbraco-ui/uui-icon-registry-essential": "1.10.0-rc.0", + "@umbraco-ui/uui-input": "1.10.0-rc.0", + "@umbraco-ui/uui-input-file": "1.10.0-rc.0", + "@umbraco-ui/uui-input-lock": "1.10.0-rc.0", + "@umbraco-ui/uui-input-password": "1.10.0-rc.0", + "@umbraco-ui/uui-keyboard-shortcut": "1.10.0-rc.0", + "@umbraco-ui/uui-label": "1.10.0-rc.0", + "@umbraco-ui/uui-loader": "1.10.0-rc.0", + "@umbraco-ui/uui-loader-bar": "1.10.0-rc.0", + "@umbraco-ui/uui-loader-circle": "1.10.0-rc.0", + "@umbraco-ui/uui-menu-item": "1.10.0-rc.0", + "@umbraco-ui/uui-modal": "1.10.0-rc.0", + "@umbraco-ui/uui-pagination": "1.10.0-rc.0", + "@umbraco-ui/uui-popover": "1.10.0-rc.0", + "@umbraco-ui/uui-popover-container": "1.10.0-rc.0", + "@umbraco-ui/uui-progress-bar": "1.10.0-rc.0", + "@umbraco-ui/uui-radio": "1.10.0-rc.0", + "@umbraco-ui/uui-range-slider": "1.10.0-rc.0", + "@umbraco-ui/uui-ref": "1.10.0-rc.0", + "@umbraco-ui/uui-ref-list": "1.10.0-rc.0", + "@umbraco-ui/uui-ref-node": "1.10.0-rc.0", + "@umbraco-ui/uui-ref-node-data-type": "1.10.0-rc.0", + "@umbraco-ui/uui-ref-node-document-type": "1.10.0-rc.0", + "@umbraco-ui/uui-ref-node-form": "1.10.0-rc.0", + "@umbraco-ui/uui-ref-node-member": "1.10.0-rc.0", + "@umbraco-ui/uui-ref-node-package": "1.10.0-rc.0", + "@umbraco-ui/uui-ref-node-user": "1.10.0-rc.0", + "@umbraco-ui/uui-scroll-container": "1.10.0-rc.0", + "@umbraco-ui/uui-select": "1.10.0-rc.0", + "@umbraco-ui/uui-slider": "1.10.0-rc.0", + "@umbraco-ui/uui-symbol-expand": "1.10.0-rc.0", + "@umbraco-ui/uui-symbol-file": "1.10.0-rc.0", + "@umbraco-ui/uui-symbol-file-dropzone": "1.10.0-rc.0", + "@umbraco-ui/uui-symbol-file-thumbnail": "1.10.0-rc.0", + "@umbraco-ui/uui-symbol-folder": "1.10.0-rc.0", + "@umbraco-ui/uui-symbol-lock": "1.10.0-rc.0", + "@umbraco-ui/uui-symbol-more": "1.10.0-rc.0", + "@umbraco-ui/uui-symbol-sort": "1.10.0-rc.0", + "@umbraco-ui/uui-table": "1.10.0-rc.0", + "@umbraco-ui/uui-tabs": "1.10.0-rc.0", + "@umbraco-ui/uui-tag": "1.10.0-rc.0", + "@umbraco-ui/uui-textarea": "1.10.0-rc.0", + "@umbraco-ui/uui-toast-notification": "1.10.0-rc.0", + "@umbraco-ui/uui-toast-notification-container": "1.10.0-rc.0", + "@umbraco-ui/uui-toast-notification-layout": "1.10.0-rc.0", + "@umbraco-ui/uui-toggle": "1.10.0-rc.0", + "@umbraco-ui/uui-visually-hidden": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-action-bar": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-action-bar/-/uui-action-bar-1.9.0.tgz", - "integrity": "sha512-zC04eyzhpMOXb564aW02ck8ZnsdyuPvIUuarFQ35jSXJhi0PBG30vFKwTsykrEJUIctbfSX/TnhFBfxiJwBwiw==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-action-bar/-/uui-action-bar-1.10.0-rc.0.tgz", + "integrity": "sha512-yzWfSI+Q4XBIwvLslcYMtjmJnztkywUsaEI13B//Zh3qf/wREMritPTc3gsQ8VQ55iFVTrwQs8HmcJ7ABN1/Yw==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0", - "@umbraco-ui/uui-button-group": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0", + "@umbraco-ui/uui-button-group": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-avatar": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-avatar/-/uui-avatar-1.9.0.tgz", - "integrity": "sha512-dRRT0Md3nIeBriY2Ku0butfH4DPJ+sijgy4cx6d1nQLRi0vFZkvHlWxcNw6642Ma6eYs5aTxbYjqjj23+xPWTw==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-avatar/-/uui-avatar-1.10.0-rc.0.tgz", + "integrity": "sha512-Uy06I5dTFOeh3nKePGAVHHuOIen5YXAuaXeNeVAi8vZB1vKE0syNUqvkAHf/Unk7J/+dtF6sVz1ltgpmz249Ww==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-avatar-group": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-avatar-group/-/uui-avatar-group-1.9.0.tgz", - "integrity": "sha512-PsOeG93AADsc9KrRueEa8gblTlRJKn+QgPc0is0y3Mu8kT913a+e5IIMkJoPwu/bzEZGVWaJOUBpUjmwhk422w==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-avatar-group/-/uui-avatar-group-1.10.0-rc.0.tgz", + "integrity": "sha512-yVOGzZ3xZRqN5BHR1L6dFVLhVFGnFw0UtADm/eM8O+BWFdACOZI/UjOuT0K32N5mO6hNKpjqa7+DBSByu+mdDg==", "dependencies": { - "@umbraco-ui/uui-avatar": "1.9.0", - "@umbraco-ui/uui-base": "1.9.0" + "@umbraco-ui/uui-avatar": "1.10.0-rc.0", + "@umbraco-ui/uui-base": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-badge": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-badge/-/uui-badge-1.9.0.tgz", - "integrity": "sha512-SLJUYQFBweGk6HqkLtzOZ6zQgUOHOQW2yOqcfu2fEnvX/PCRQyPuHOYLVqXbLR3ucUBktYcCon0Ut3LiVhTIoQ==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-badge/-/uui-badge-1.10.0-rc.0.tgz", + "integrity": "sha512-72diFwaDHoX4u//e3rCSqFTQ0c4VpF8r3VX2wrKuI4lOeykuHoD5NCWtZRoA6ar4P4YqnoofwuouqxhYNPO0MQ==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-base": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-base/-/uui-base-1.9.0.tgz", - "integrity": "sha512-ZLL/Ukv+z3hGePNFY4GD5Ep4gMho4AW+EtfLfgEuzxOegQgamAVvYGDWkGRDk6ksGTqrgtHIqmZiKBnnPmR2MQ==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-base/-/uui-base-1.10.0-rc.0.tgz", + "integrity": "sha512-E0+3G3FxWPzaVh3vkArUMKCF/1IsCozGBqeHoAUGz2bkfvcOyZuRTfIhvjOPZcArV3xLiZqcfUDdFcT+4lnsTA==", "peerDependencies": { "lit": ">=2.8.0" } }, "node_modules/@umbraco-ui/uui-boolean-input": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-boolean-input/-/uui-boolean-input-1.9.0.tgz", - "integrity": "sha512-vDkB5Z/aXlIKB99AKktjvEacD7f8xV0Wfx4N6LKY2ER1XS7fGc0OuLPcH8kOqomuc+D1/cd5qhc3UPSunmXnfQ==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-boolean-input/-/uui-boolean-input-1.10.0-rc.0.tgz", + "integrity": "sha512-XwD+oRwtW7Earnqhi4TauciA8oYHkLDHb3TqwlH9VoCfXw9vexCHOeH2g0hy3d8EtdE8Fo6rJ33wXMsrFNr+jQ==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-box": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-box/-/uui-box-1.9.0.tgz", - "integrity": "sha512-bVpW88FBh/vjDF0147bO062IT54n0oQk8JJftEGiaCCR6XMFlMoG++63kb8siXFrCuPz9kbVqRr6m3RsRXn7Qg==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-box/-/uui-box-1.10.0-rc.0.tgz", + "integrity": "sha512-XTMjYk9HlKmRv4ni7yR4wbgcmrKIZxcioJJJctLNXFP4EHFI5Q3yqXyr5j2jwAQ1LOY5zgao0auFzUtS7n8kLQ==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0", - "@umbraco-ui/uui-css": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0", + "@umbraco-ui/uui-css": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-breadcrumbs": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-breadcrumbs/-/uui-breadcrumbs-1.9.0.tgz", - "integrity": "sha512-gusTjjUbN2XI8sHNTlvi3o2HBf2mEf8UQtuZS2OJ5H8nFVgD8lmSSTwWV9Pc5wwZl6SvjK9AW4+00Rry5G7FdQ==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-breadcrumbs/-/uui-breadcrumbs-1.10.0-rc.0.tgz", + "integrity": "sha512-bTl8//vgCy4aWo941KYUnuJYFzTchXyAouheR/LBZr5b3csgbn26vqhuTgXNxQoypxHepa0skrFbJc8NUvJdkw==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-button": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-button/-/uui-button-1.9.0.tgz", - "integrity": "sha512-R9/jFCXDGdsATY2nE5erp3q7h/YF1UsM2rzSwqcHuUVut7tx0f0qDB4jB0Q/MNRg1vstTVQS3+j/ZzVXCnyE0Q==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-button/-/uui-button-1.10.0-rc.0.tgz", + "integrity": "sha512-s5GnQeVgq5tryNOIVWcU1bH9+I+b7jnaMHUfuE7v9p4ubCBImS4ntREJOr3m28p1v5DBN5luwr00Dlko4NtX6w==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0", - "@umbraco-ui/uui-icon-registry-essential": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0", + "@umbraco-ui/uui-icon-registry-essential": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-button-group": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-button-group/-/uui-button-group-1.9.0.tgz", - "integrity": "sha512-XpnithZ+dnv38LV+QZDgvfuJU05c6U04sDde5AFXKMQfoWkfupZ0wPuXv5oE6p8bSQ9vSoOa6Htr47SQZ2CrNg==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-button-group/-/uui-button-group-1.10.0-rc.0.tgz", + "integrity": "sha512-KPeLDYDyQWwXh3pOmyoB/UXAgNhENQeP2NsHYVVD5cjz3ppoB1Sg7pgbuDzOZ+9BUcnpDxmAb2NNUV9MZE2M+Q==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-button-inline-create": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-button-inline-create/-/uui-button-inline-create-1.9.0.tgz", - "integrity": "sha512-V0qmvJgaOW3Ob1qYRlP2bIeSqCtMifVVgYQanJVnML4jMLDUPvONb4Y3nTO7jROCDSHLkn7pRsl9nJ0BMTccyw==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-button-inline-create/-/uui-button-inline-create-1.10.0-rc.0.tgz", + "integrity": "sha512-bqYVEoJumD4n3V2cqtEYM8KQ/PWbBjVwCACGioHtaG52qKjCLM4h2uHUtAoG2AM5ZrKXnw0zbMxdgf6r4awvZA==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-card": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-card/-/uui-card-1.9.0.tgz", - "integrity": "sha512-ivu/Vt0vxhLeBCUGca8xSezqnV7ff0yekUuZQeNCGEajeck4WkuT+sEI/+BLsSVm/vjv88Ym0VfAwMCUPpK1Tg==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-card/-/uui-card-1.10.0-rc.0.tgz", + "integrity": "sha512-YXQVm93o6MAdy0u6oV5srX35FLbMTtx3UuYI5fw6qhYArZkIMivWIu6V6BRmzEZpFhUzwlxegh+LWFnQEoK2Dw==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-card-block-type": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-card-block-type/-/uui-card-block-type-1.9.0.tgz", - "integrity": "sha512-jJz+n444QCjSawj9rP+0LV0zAbk/5LBzkSE+2frHo3SpkccB7J3fkQOaXwK+HpSwNqzgDbQviSlQ++UL7d1m2A==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-card-block-type/-/uui-card-block-type-1.10.0-rc.0.tgz", + "integrity": "sha512-/IAvNnKajnaPMbY72QGQOs6MF15tE1+ZJcoDIaJN4huS0mCeLsUIU/irTQVkpcto/qZlzv537OKq9pI5M06SFQ==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0", - "@umbraco-ui/uui-card": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0", + "@umbraco-ui/uui-card": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-card-content-node": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-card-content-node/-/uui-card-content-node-1.9.0.tgz", - "integrity": "sha512-E+g68A+2eBXQXicRx5ZCtK2vAgW4KecOaIJVhdC19X2R7ye1SRT7P+g0zYZS7KJoSfejK8c9N5bjy0s9rFRibw==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-card-content-node/-/uui-card-content-node-1.10.0-rc.0.tgz", + "integrity": "sha512-VGcwQD65t4kI6ZbkeDA93P/hfF4AlG6qAEXnbconEBHGUxBKSnkHywCHnlYWE9DnVkflTEp2HtLaXQ7kzYk1tA==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0", - "@umbraco-ui/uui-card": "1.9.0", - "@umbraco-ui/uui-icon": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0", + "@umbraco-ui/uui-card": "1.10.0-rc.0", + "@umbraco-ui/uui-icon": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-card-media": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-card-media/-/uui-card-media-1.9.0.tgz", - "integrity": "sha512-nbiQH5uqz2zNBjpAL8f7OhKldndAT+/Vw6clH9yxXrPyKpRVQ7DOCGqCh82x5pVtXfdM+kV5iyJe8JNd7oxWJQ==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-card-media/-/uui-card-media-1.10.0-rc.0.tgz", + "integrity": "sha512-5A28Fn7yntGccSzUN5x0iF5UcNJUj9kCHzY2W/HIFHzyOb1g9d1j6HEukTdrsItuMdDXHjXmS/n582cGQ87atQ==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0", - "@umbraco-ui/uui-card": "1.9.0", - "@umbraco-ui/uui-symbol-file": "1.9.0", - "@umbraco-ui/uui-symbol-folder": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0", + "@umbraco-ui/uui-card": "1.10.0-rc.0", + "@umbraco-ui/uui-symbol-file": "1.10.0-rc.0", + "@umbraco-ui/uui-symbol-folder": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-card-user": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-card-user/-/uui-card-user-1.9.0.tgz", - "integrity": "sha512-Ar6rY5CVJcU1LKB+hJhIwQc5M1qGr921rmLohaYTR8TCDr2dZ+M2563YzxeyNoRJnXWaOepHx4zU/iyj8ws2cg==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-card-user/-/uui-card-user-1.10.0-rc.0.tgz", + "integrity": "sha512-nheAqLaUWbp+xZuLWxU1zdwJPRopGIPfvVNsxKxBxzIOP1q6GVv6MCPR58J7Djqp59ijs9Tud6Smt8vFuH8h+w==", "dependencies": { - "@umbraco-ui/uui-avatar": "1.9.0", - "@umbraco-ui/uui-base": "1.9.0", - "@umbraco-ui/uui-card": "1.9.0" + "@umbraco-ui/uui-avatar": "1.10.0-rc.0", + "@umbraco-ui/uui-base": "1.10.0-rc.0", + "@umbraco-ui/uui-card": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-caret": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-caret/-/uui-caret-1.9.0.tgz", - "integrity": "sha512-YWAtbKfhm+x7fw5C4nFaMPFp9EFwhqL2UZDpVbYdTZ1i5RxJGYqPgiQZjxmGqMDZI40r8ZWwBWiXd8DTFN1z6w==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-caret/-/uui-caret-1.10.0-rc.0.tgz", + "integrity": "sha512-OhSO5QZdmol+io9pGGebOGu44WjWyusqtpzIhrFFsU/83XdlFrVoODZ4jmZ3eZDBBlztzIaKMZUKsfBwgiy0dw==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-checkbox": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-checkbox/-/uui-checkbox-1.9.0.tgz", - "integrity": "sha512-juC5ncrgjzoBRNkHMEz5QRhFJ6shcBSePdNzXF5z2dsxJpjjewZhHpH58WvYdViMOdpjwJP8/tFUGyN8Yi5+6w==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-checkbox/-/uui-checkbox-1.10.0-rc.0.tgz", + "integrity": "sha512-8/urZ6yo/+i0Vs2yIJ0h1DjjHZYHBNHnY49h/mQoqPmEkCWem/gQz4Lc+Z9/COWihz2NQv95K7+QU26t+FJQAA==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0", - "@umbraco-ui/uui-boolean-input": "1.9.0", - "@umbraco-ui/uui-icon-registry-essential": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0", + "@umbraco-ui/uui-boolean-input": "1.10.0-rc.0", + "@umbraco-ui/uui-icon-registry-essential": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-color-area": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-color-area/-/uui-color-area-1.9.0.tgz", - "integrity": "sha512-a5iE9nFzDsbA3EBBnJR6St4XTBAy82hFgtDLECGA7XwEY1jXyeH8zpL/ooluzMK3AYdYqGOQMboSzYFw9GvCCg==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-color-area/-/uui-color-area-1.10.0-rc.0.tgz", + "integrity": "sha512-D5McF22Z3O6VmGmQPJmo7NVvtdW1LJMsBFLyRzMcZRwES/tMkCk1MVrQ6cQm36chkuQo6vBIW77QFeuQOuwvFw==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0", + "@umbraco-ui/uui-base": "1.10.0-rc.0", "colord": "^2.9.3" } }, "node_modules/@umbraco-ui/uui-color-picker": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-color-picker/-/uui-color-picker-1.9.0.tgz", - "integrity": "sha512-I9FT7Bkf6dvR8y2UTxeJLnhT9V59C8cWBBdhyGlH87/X5qZUgo9qQcKxzRm4Xn0MMeA7VH2wm5GFwKIodGPElQ==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-color-picker/-/uui-color-picker-1.10.0-rc.0.tgz", + "integrity": "sha512-UBDZnCDOSz4hn5z/0vGemnHm4fYAgh6dj/3jCSDvC3LOByasbBEPwolqBxxTT62R2z6+0pv9rDphqam26abqEg==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0", - "@umbraco-ui/uui-popover-container": "1.9.0", + "@umbraco-ui/uui-base": "1.10.0-rc.0", + "@umbraco-ui/uui-popover-container": "1.10.0-rc.0", "colord": "^2.9.3" } }, "node_modules/@umbraco-ui/uui-color-slider": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-color-slider/-/uui-color-slider-1.9.0.tgz", - "integrity": "sha512-HNh/dup4iFCiOdoIWLGsKp69UEzFYV66Q6N0MuLlZeI2pXKwzY7YAE12VUZ+YkDDOuuQJkuMziUvA4CcO6sTVg==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-color-slider/-/uui-color-slider-1.10.0-rc.0.tgz", + "integrity": "sha512-/SVWPR6JG/ezumom5wf519vRjaI8igqXaFLG6ejb4EhdLKNwHn88P7g7Tg4FNXoAxU0iOkFZ78WjevjtkNd4mg==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-color-swatch": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-color-swatch/-/uui-color-swatch-1.9.0.tgz", - "integrity": "sha512-zZ8KYeyUebFmG2RVeOhiOjUmrVrxellWxryfOwSDUj2FGwguS72MetrkxzuQEbN3P2zkrjiBSQlYpa6C1iwrhg==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-color-swatch/-/uui-color-swatch-1.10.0-rc.0.tgz", + "integrity": "sha512-3OxzRLxbGtb24Ky8o7C2EjVfiT/gZfDiHvhW7vUZ0uIBCm8AFRHqCejYR9SEtTHP+3KzjiDYQ8ahE5ujUzlOIg==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0", - "@umbraco-ui/uui-icon-registry-essential": "1.9.0", + "@umbraco-ui/uui-base": "1.10.0-rc.0", + "@umbraco-ui/uui-icon-registry-essential": "1.10.0-rc.0", "colord": "^2.9.3" } }, "node_modules/@umbraco-ui/uui-color-swatches": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-color-swatches/-/uui-color-swatches-1.9.0.tgz", - "integrity": "sha512-uoOuMxVDHzxmPrYwLhAEmAo3u2mfbofBBu/BJxGN9Wcd1LXnjIyM9CYjfKSp1CD8S88pf5mNpkOPMarY2q3n6g==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-color-swatches/-/uui-color-swatches-1.10.0-rc.0.tgz", + "integrity": "sha512-XSf96rqVZmMSsq6D9mfzA+h+3oz+3ye32GnXlwYD1Sd38Mm71AtWzA61To90VhZRzmlmT43Q9i7LYKEGMkY8Kg==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0", - "@umbraco-ui/uui-color-swatch": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0", + "@umbraco-ui/uui-color-swatch": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-combobox": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-combobox/-/uui-combobox-1.9.0.tgz", - "integrity": "sha512-Cd5Sz6ssV0tkNnAmYTqjTE0y5Q1IxPIUnRAjUOsbvavMVwAzyCLLdVxq5Kztr9wyk0TG5q6kCqle4w9wsA0vSg==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-combobox/-/uui-combobox-1.10.0-rc.0.tgz", + "integrity": "sha512-6l1bLH6HSvLVmUerXyAemVrdCbnn9YkYB4IjQsREZcTtxo9S3e40Q/321uyIOrMZLoEh38eD2CxzJLK/mPq3vQ==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0", - "@umbraco-ui/uui-button": "1.9.0", - "@umbraco-ui/uui-combobox-list": "1.9.0", - "@umbraco-ui/uui-icon": "1.9.0", - "@umbraco-ui/uui-popover-container": "1.9.0", - "@umbraco-ui/uui-scroll-container": "1.9.0", - "@umbraco-ui/uui-symbol-expand": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0", + "@umbraco-ui/uui-button": "1.10.0-rc.0", + "@umbraco-ui/uui-combobox-list": "1.10.0-rc.0", + "@umbraco-ui/uui-icon": "1.10.0-rc.0", + "@umbraco-ui/uui-popover-container": "1.10.0-rc.0", + "@umbraco-ui/uui-scroll-container": "1.10.0-rc.0", + "@umbraco-ui/uui-symbol-expand": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-combobox-list": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-combobox-list/-/uui-combobox-list-1.9.0.tgz", - "integrity": "sha512-DpHJvnVmQ0Df/gnezr4xlUhFws93QcHSMIZqgpSKPk7PXawrX62pE6ma2sB8cs+8R12e72Ldd5dULuLsRo9v0Q==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-combobox-list/-/uui-combobox-list-1.10.0-rc.0.tgz", + "integrity": "sha512-u0GncF8M/jAbtsRmaBG0oVARfnleh+aIPZTYOEhLKfVKNCcgLu/QP4AwpSDg8wvXqYOrDRipy8GZd2ZjMd11FQ==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-css": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-css/-/uui-css-1.9.0.tgz", - "integrity": "sha512-JJcN6HN+jGGCJFUDnZIshNL1H38TYN8AuSfQoTzxECmgogEjZsIO9oihT3XQiha1SPMH+u2+4ddqFDSm5Vlofw==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-css/-/uui-css-1.10.0-rc.0.tgz", + "integrity": "sha512-R+dZT091X9wnKfF5u3bJ3xq88s9Q+4RkW7WDSTwqw1p0MCf5OpKZGt3LmloDKu3snFAEXNzevZzCulTMnhO9Wg==", "peerDependencies": { "lit": ">=2.8.0" } }, "node_modules/@umbraco-ui/uui-dialog": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-dialog/-/uui-dialog-1.9.0.tgz", - "integrity": "sha512-VTn/L2N2TbPPbs0vLRUjqWtLelNwCApixsv21yDf5qJHORqYZCzEtgStFNGFC1EBg23nv+x+7CoMibOt3tejZg==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-dialog/-/uui-dialog-1.10.0-rc.0.tgz", + "integrity": "sha512-7CmAgheSKGbaDqaV6YH5fOd4cMZrOa5AEzlwT2rL2AnkShOpnSVlux3J4NsCQbuVZkCgYRv+Mf5mY+daI8wojw==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0", - "@umbraco-ui/uui-css": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0", + "@umbraco-ui/uui-css": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-dialog-layout": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-dialog-layout/-/uui-dialog-layout-1.9.0.tgz", - "integrity": "sha512-a+CmdXuObNNi2W+/3+r9QH/qYkzp4QqJgFbVkCP+H9yoZRsZhcHunL0mObGD7anBXYDe47a9ILAIWlT+EwoKKQ==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-dialog-layout/-/uui-dialog-layout-1.10.0-rc.0.tgz", + "integrity": "sha512-rDgeYEkoxivTl6MXOOV/aOMH3yrPMyLsrPyxbwB+7coHPJtXjmejs8ON+n2bW8USZNZr3ll3PDwq8X+rdA1b8g==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-file-dropzone": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-file-dropzone/-/uui-file-dropzone-1.9.0.tgz", - "integrity": "sha512-ddKUYzVWjx612EmsgMuX/OQw5YnXxfb/MQ3CKMuKSUFJuq4scVCmI3p4B6ge426BLVqcDrQZkiB9M3RTTshtbQ==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-file-dropzone/-/uui-file-dropzone-1.10.0-rc.0.tgz", + "integrity": "sha512-l3RlwpITjMX+4CuBfiDK8fg8igI/V2D6TUxy1UNDojLhAPdEpLfccrKzUfhH+CGBnWCrePhu8jethdCL16pujA==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0", - "@umbraco-ui/uui-symbol-file-dropzone": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0", + "@umbraco-ui/uui-symbol-file-dropzone": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-file-preview": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-file-preview/-/uui-file-preview-1.9.0.tgz", - "integrity": "sha512-k21nnCd4wA9MG3Rua2bEc/V19CZG7SHhRVAF9ejS1HqR0GG++d+TnBZBJOKol8AGEvePkiZfrQyqx63lraFX8A==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-file-preview/-/uui-file-preview-1.10.0-rc.0.tgz", + "integrity": "sha512-xNKv6y0/3BoQaFz8WpicdsrbziijabZUp5TJ0p26oSEZaBSSYeIr+XxZrdWbxG/M9iDRRSmrZbsCbKIvXTJ1wA==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0", - "@umbraco-ui/uui-symbol-file": "1.9.0", - "@umbraco-ui/uui-symbol-file-thumbnail": "1.9.0", - "@umbraco-ui/uui-symbol-folder": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0", + "@umbraco-ui/uui-symbol-file": "1.10.0-rc.0", + "@umbraco-ui/uui-symbol-file-thumbnail": "1.10.0-rc.0", + "@umbraco-ui/uui-symbol-folder": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-form": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-form/-/uui-form-1.9.0.tgz", - "integrity": "sha512-nm/3ZgZKEThjVz80zU9yuI7QFc7isgjL028FeE/IPWVf/yUuJCA/ZAwGuUNygreYdPG5ni5ixV+IXEGaAKCHxQ==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-form/-/uui-form-1.10.0-rc.0.tgz", + "integrity": "sha512-d2+uW43ojVaHGgLBKNm+/tGYJi36FWTwY++l9fWYmlHLyEM5U0LVpLM+cKRMbyCJB3HoWuZGjBf+pvpuzx+Sxg==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-form-layout-item": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-form-layout-item/-/uui-form-layout-item-1.9.0.tgz", - "integrity": "sha512-FNna+/6NUNQ418OG8j5+wsVH5wU+2LTnXrqL5otM+q2PoAmjfG/2vLFpfrjqLy1cljT4g/mF8bqQSLUwI42Ypw==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-form-layout-item/-/uui-form-layout-item-1.10.0-rc.0.tgz", + "integrity": "sha512-2b5CFy072j66jnV2wgWCUMiegdXIwqihxptcAeK6lr51FzbydOXnmyi8PIjtY59qd0dSF2Gr7ynOzoEt9G96Wg==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0", - "@umbraco-ui/uui-form-validation-message": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0", + "@umbraco-ui/uui-form-validation-message": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-form-validation-message": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-form-validation-message/-/uui-form-validation-message-1.9.0.tgz", - "integrity": "sha512-GGX7p76OWLSFqQGQc4RX9QfGd1a2mGasU/oEuIDJ6SHfqHQTtn4fclF8UWFHNPbeg3mqZLlk2XgDy0ZUr05qjw==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-form-validation-message/-/uui-form-validation-message-1.10.0-rc.0.tgz", + "integrity": "sha512-Fhny5SWNMJb6A6Ojm29X+im20jHzLllhljue2zJ5/lzbhImMsF2cXqHZaziqjr51HnFkbG2CcIXhCNYwjwpCJA==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-icon": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-icon/-/uui-icon-1.9.0.tgz", - "integrity": "sha512-7zfppwNgGRRIAWecVRvZFIRL3/hJqz1lk5T8Be8EQWkHb12d0TsZd2nmZsUfQTdbgj7o/LS0VePBvO/E2c9ICQ==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-icon/-/uui-icon-1.10.0-rc.0.tgz", + "integrity": "sha512-jy/06iEG6jPglKdDn8pVpDS4anW9Q+8bvSinncI/s7bPkSkFF22v1z0ELRV+gsKoa78z53a2ZsdLMjkJNZ2fwg==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-icon-registry": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-icon-registry/-/uui-icon-registry-1.9.0.tgz", - "integrity": "sha512-ahKtq33kymvQFXolPmXtCQE9GKJc3gQIMpF9qr95iV5fLUgpTZrWkSqGAZxA9KainuQCBuFhF2ftCt1v4hcemg==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-icon-registry/-/uui-icon-registry-1.10.0-rc.0.tgz", + "integrity": "sha512-6Q17o+F6CadGTkmtVGUAkAoE2HjQqXhG5pRBgH08GUibdhBpaxa5XVIO3imW7yC2NQBLPVxAAM/tATT9DW4TJQ==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0", - "@umbraco-ui/uui-icon": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0", + "@umbraco-ui/uui-icon": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-icon-registry-essential": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-icon-registry-essential/-/uui-icon-registry-essential-1.9.0.tgz", - "integrity": "sha512-/XBdqvpCc63352YNdsgLfNpusbWUM42xtPGyfo44HjpD3et0fggeTLWG6PgC0qLHXVF8UOIOE31CC6fWAvEclg==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-icon-registry-essential/-/uui-icon-registry-essential-1.10.0-rc.0.tgz", + "integrity": "sha512-6kPXq6lE+bcUUmOZ5KJ5/TRTsYAet8LAsgbBmsudGSE3RDatDhe7NUhKGhliwNViJsVE9pm3uA3HMmtCHhWrHQ==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0", - "@umbraco-ui/uui-icon-registry": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0", + "@umbraco-ui/uui-icon-registry": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-input": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-input/-/uui-input-1.9.0.tgz", - "integrity": "sha512-qBhY8Hx2lAinyk3WIGN1DhTWc412yYbE0eLi+8s3f7CdHb8EQJmP43qRAoeUS82uJ0PC/BxNkYPCR5xlPRH3Iw==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-input/-/uui-input-1.10.0-rc.0.tgz", + "integrity": "sha512-QriIbqMcChLKZjUQto+jH5KlKsOnb4rifVpkEY7IGzlCXpGWMF+KfCvcuG2sChCE5jc0XN56d/ou5VeXSa0gbg==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-input-file": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-input-file/-/uui-input-file-1.9.0.tgz", - "integrity": "sha512-NhPvPDd1PF3qLs2/QFffwIqL2Dq2Mz/tee1QYjV09yQXjHGn2GL7Uy2obQRnB8iIDBMfm4g46j1Ew7FZWIcl1Q==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-input-file/-/uui-input-file-1.10.0-rc.0.tgz", + "integrity": "sha512-k7APb+NV9kH/p2Ut1Mj/aC+obOh2hnsvFxvCJdyFnCpEEuFF8zH++KCbyRYlTC6lW+Np/gfepBkUtHRZ/rJSaA==", "dependencies": { - "@umbraco-ui/uui-action-bar": "1.9.0", - "@umbraco-ui/uui-base": "1.9.0", - "@umbraco-ui/uui-button": "1.9.0", - "@umbraco-ui/uui-file-dropzone": "1.9.0", - "@umbraco-ui/uui-icon": "1.9.0", - "@umbraco-ui/uui-icon-registry-essential": "1.9.0" + "@umbraco-ui/uui-action-bar": "1.10.0-rc.0", + "@umbraco-ui/uui-base": "1.10.0-rc.0", + "@umbraco-ui/uui-button": "1.10.0-rc.0", + "@umbraco-ui/uui-file-dropzone": "1.10.0-rc.0", + "@umbraco-ui/uui-icon": "1.10.0-rc.0", + "@umbraco-ui/uui-icon-registry-essential": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-input-lock": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-input-lock/-/uui-input-lock-1.9.0.tgz", - "integrity": "sha512-OcLheKTRUWx8A6y5zyTjrZH6CIyrceWhsRYuEynDVB1ZjxDo7NiuOiUwpgZgnvaiwoJngGmq7JIGlqO2o25g0w==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-input-lock/-/uui-input-lock-1.10.0-rc.0.tgz", + "integrity": "sha512-/+4i4mB90g6TIQJcPgp9X/TAzsRNcs9FCahFiXNRhRUMvUScTG97xdKCOMLZZMMMtk+VQFa091KaL9Csvpjrcw==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0", - "@umbraco-ui/uui-button": "1.9.0", - "@umbraco-ui/uui-icon": "1.9.0", - "@umbraco-ui/uui-input": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0", + "@umbraco-ui/uui-button": "1.10.0-rc.0", + "@umbraco-ui/uui-icon": "1.10.0-rc.0", + "@umbraco-ui/uui-input": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-input-password": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-input-password/-/uui-input-password-1.9.0.tgz", - "integrity": "sha512-PDoio7RIX+G+LWip1hyMSytP0qXOBysA8x/JhDy1EbTQKa4oqRebip/8LHUf4gC/GRRwCF4sSywS2L1inG9ZDQ==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-input-password/-/uui-input-password-1.10.0-rc.0.tgz", + "integrity": "sha512-K7Dq7cl/W21ezlcI+3rFYvzFIyftp2QxW21taTRVZSuwZijM2BA7AyCzlzTN4EBeRXXoZEWip7CYP43STBaZZg==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0", - "@umbraco-ui/uui-icon-registry-essential": "1.9.0", - "@umbraco-ui/uui-input": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0", + "@umbraco-ui/uui-icon-registry-essential": "1.10.0-rc.0", + "@umbraco-ui/uui-input": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-keyboard-shortcut": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-keyboard-shortcut/-/uui-keyboard-shortcut-1.9.0.tgz", - "integrity": "sha512-DpD5fGxzGsB0/eaPssUEtIbFB2ZxaerV0Im+XnDp3iswwmFq1OfvHAJogokpHqdaHJPKspJA60JQgDlaDAbuvQ==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-keyboard-shortcut/-/uui-keyboard-shortcut-1.10.0-rc.0.tgz", + "integrity": "sha512-A5S6iyVw1TQzyN8jmh4NMwocfpdBnLxYLVPX/S7r1g6KCDUlmXMqxZayO2CpSWotwvOAcTvxQ+ZyE7VXYlWzLw==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-label": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-label/-/uui-label-1.9.0.tgz", - "integrity": "sha512-rCdTckRcZMw0S3JF7d06L48CpKgAOFMarmrybwXOp/dCbQ6i4bCYtn4U6zZkjqaz6mt/PixoKuMtQ0tCJu7Dnw==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-label/-/uui-label-1.10.0-rc.0.tgz", + "integrity": "sha512-Kro5SZdJ8PQPAb79GSL/yy/eRyf5jN4R2lpA7RfXgGFQvsew3ef1AEM4N9KgWEyn3n3pJS7DgvDKeAtTnbV0aQ==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-loader": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-loader/-/uui-loader-1.9.0.tgz", - "integrity": "sha512-qSDB1zJt4rbkURMLsBmoGaehntTBuz9WyrFwhEH4/VKiyf7xG6OAaFFM0/G90IXor9IgVxc3qbe6IQJ0u7ESOQ==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-loader/-/uui-loader-1.10.0-rc.0.tgz", + "integrity": "sha512-HTb/iP8Qf1gHjmdERi+g5GKu+YL5Nn8TKDj6IAcI6Tjssy1Yg0TSUTkw77adWYLinPmnOYH4pvFEcxRc7mufVQ==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-loader-bar": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-loader-bar/-/uui-loader-bar-1.9.0.tgz", - "integrity": "sha512-vKn0JaddJmkHN8d315J6Maf1vRwLz+MxdAZPh8o7CkP6aar0EKdd5sf6SXQo2k6R06HIdOfe7Q9Hro/5p4GxIw==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-loader-bar/-/uui-loader-bar-1.10.0-rc.0.tgz", + "integrity": "sha512-0BJUSI+AdbIm+l6OHMTbBKSyP3B+2+kK1HIu0px47h+v38lTnQiwgBE4UajqeSBvElIeJh+/ftuqHCsCjN6QqQ==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-loader-circle": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-loader-circle/-/uui-loader-circle-1.9.0.tgz", - "integrity": "sha512-0Yh+awN4kfpwpa9VGGxJQmgu8i8NCNmGmDmgvNs1FFm0Mj5VXzqmFWJIlSva+DMou/XBbD43pCIdlQjzDxO9hQ==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-loader-circle/-/uui-loader-circle-1.10.0-rc.0.tgz", + "integrity": "sha512-ViCAnKKXTCJW5oDHK6orYPXc09dPhbGKGScxB35rKZF72blo8/kB9uOnKC7BRIQ8J6gxBQulc0xltn3Mylsn/w==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-menu-item": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-menu-item/-/uui-menu-item-1.9.0.tgz", - "integrity": "sha512-1FSj8F8hXU0PBewEVmWnIJUPtL4ezQyGg2rdFwSS7uXplcnde3AIsF0ckSRjOHBOxltjfAd9GHhNoyY2Y8iuuw==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-menu-item/-/uui-menu-item-1.10.0-rc.0.tgz", + "integrity": "sha512-vqEPuSopZPsZVfHug+rU++KHPmmOb4dvmTxGlZvybZB2ne7uaJUasahNYW8cUza06/68pkZ6A1SVfHrntZaDAg==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0", - "@umbraco-ui/uui-loader-bar": "1.9.0", - "@umbraco-ui/uui-symbol-expand": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0", + "@umbraco-ui/uui-loader-bar": "1.10.0-rc.0", + "@umbraco-ui/uui-symbol-expand": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-modal": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-modal/-/uui-modal-1.9.0.tgz", - "integrity": "sha512-CVNolN0Wkoym52YjiWmRqhdjYMupY2Jr2Mf9N3muQ9DetcSzsMNCGtoRQeWsBWSGzHvQ8gslyb2EjGa+8zttng==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-modal/-/uui-modal-1.10.0-rc.0.tgz", + "integrity": "sha512-mAgXfKvPAm283oCJ5B8mYro34yV/bBjg2WXpptcILKUElehbMEo39c7XDfUoUy8RsbgoJ2J8GwVsh0ney4iuAA==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-pagination": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-pagination/-/uui-pagination-1.9.0.tgz", - "integrity": "sha512-hIE+oud6vaNwU/lRqzj3ZWl4N0JIjwaAqTlpeekWKcnHOIPmqrOB9/OYJzYukjYD7QDW1K5YSWzVSktrAEH9DA==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-pagination/-/uui-pagination-1.10.0-rc.0.tgz", + "integrity": "sha512-NOzhjXvcdF+iG2dIX2++90EnDsilxh9zKRFXyxW86ADFLW0TKgU7RUp7s+bg3y/WUA9w9sBkMr1CtrB5BzR3Ew==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0", - "@umbraco-ui/uui-button": "1.9.0", - "@umbraco-ui/uui-button-group": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0", + "@umbraco-ui/uui-button": "1.10.0-rc.0", + "@umbraco-ui/uui-button-group": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-popover": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-popover/-/uui-popover-1.9.0.tgz", - "integrity": "sha512-EEuDGY1luSfYGTNojB3+8WOcTQhQ11CGoBp7b+Jlwv43AMThgnHXERqWL3QxpA70ksovFuKuRoo7YpMTH7GV+Q==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-popover/-/uui-popover-1.10.0-rc.0.tgz", + "integrity": "sha512-DIMsJ31edx3+8ZomQoKakOrjT0hWKgbFkXt0KjwU00FC/cDNJtuL8CUwM7vlcgRy1YzCkbZocQ8M1Pt8rxuUFw==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-popover-container": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-popover-container/-/uui-popover-container-1.9.0.tgz", - "integrity": "sha512-52D6vmbU6HP2LnLkk0JbNx4l75hemyFcbRSYwF5fVMt+GJOn05PZou01QYa3IInoObVELvbo1qmP6f3FAIoEYQ==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-popover-container/-/uui-popover-container-1.10.0-rc.0.tgz", + "integrity": "sha512-Bufn+sBYgstGU5PAzbgvwKPtFAsx73aPeFHPJL3JO7aehIk5qaku0WhmAwKxwcgjO31yP/DxH2MJC3a4FbpW7g==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-progress-bar": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-progress-bar/-/uui-progress-bar-1.9.0.tgz", - "integrity": "sha512-H645Bj4KLUBNuCzKRDzdl3J+opRBspMMVW9/diBt9cwdAI7LMKpAD+xDyMpyjO3vTY1gWAAbgAtVtqmybZl+Vw==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-progress-bar/-/uui-progress-bar-1.10.0-rc.0.tgz", + "integrity": "sha512-ilHRDvdTKZDDAVetbpBvMRcmhroqqcBRHafULtIL5BKDX0fCblLnB1XKoowQpPUv6fS2SwFHuogDJcRFmJHrQw==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-radio": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-radio/-/uui-radio-1.9.0.tgz", - "integrity": "sha512-+GPjzxNWuZH6N5LC05nzcE1993I97r7PpczbS2MF6f2Fwa/2S+D9fF+y6pM3QPLtB9q4259pYJ8Y4RBjzVauPw==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-radio/-/uui-radio-1.10.0-rc.0.tgz", + "integrity": "sha512-fTm8QV8B/N+jva2otkOMvPf49NwifN/q9FyvR4fcB6ngmDlIWtgrVDePvd4jTsGb9MNmqpchASv1GQxdK1gM+Q==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-range-slider": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-range-slider/-/uui-range-slider-1.9.0.tgz", - "integrity": "sha512-/N4mDqJDeT9JKIeRTMGxb+qB7uw2b/R41+7oAROuEa1295AsIPeaVp1my2MLte9s3p6kJF5F6gOIaAJ1S9euOw==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-range-slider/-/uui-range-slider-1.10.0-rc.0.tgz", + "integrity": "sha512-XPvSZWamsTJVwisIDHudzRjWsI2sz5fv673cinkkPB3nB+s7xlESmNvZuon9mCpzgb9pnzOouy10Xv7bR3GNPQ==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-ref": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-ref/-/uui-ref-1.9.0.tgz", - "integrity": "sha512-eSS/oJV2ru+dLiyOdj3ErN9Gb2NFvXQBTXXMXb8Oq+Kkhijx7yABoJUTYgw7MDnzUGKXP9XnP/nrUnKjK5DCYw==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-ref/-/uui-ref-1.10.0-rc.0.tgz", + "integrity": "sha512-k6SwZpmGUd/3A81QG6x5ar1SrRZRgkaALmzOG7vfnefq0DBST0FKNFBFzxZLBIVz6FmWGpZNr65OQdHdhXFjQA==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-ref-list": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-ref-list/-/uui-ref-list-1.9.0.tgz", - "integrity": "sha512-yyoWcrm3fMKe/BRS2rUA1DECaSnTBtSrEIQLWGx8mqImuH+macQzDq58QNtbfyQ0UMyntYVSt10Ez00tBtkDTA==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-ref-list/-/uui-ref-list-1.10.0-rc.0.tgz", + "integrity": "sha512-PFFAjYkdz07uosSVhJHNGA+nstC6TwAZQb6nULpOPjb1ZNvkO5eSaF6iIrcbcTl0JenK6YmbVoJ5ht+FN/m8Jw==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-ref-node": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-ref-node/-/uui-ref-node-1.9.0.tgz", - "integrity": "sha512-vo1SOxlqd5N/Dzu5L0oEAv0VHo8x9yUuzEEIyGJ+xb9JtVbyTpT+DbpubDZMGvL7cldL+FXMGxS0dC0c6qhWng==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-ref-node/-/uui-ref-node-1.10.0-rc.0.tgz", + "integrity": "sha512-kVU35pcCmfcE37rRbfxIKkXTP7owH8bm7/fOjOAnbPWa64vCBzSa+INbTmpP2AvGkbXwI1alsaDuK01kKlMKiQ==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0", - "@umbraco-ui/uui-icon": "1.9.0", - "@umbraco-ui/uui-ref": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0", + "@umbraco-ui/uui-icon": "1.10.0-rc.0", + "@umbraco-ui/uui-ref": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-ref-node-data-type": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-ref-node-data-type/-/uui-ref-node-data-type-1.9.0.tgz", - "integrity": "sha512-ubuFlwyZjf1sFgq13yD9Pr2zTLtQ6a8eqbN4uQTZ8J9THM187QeRnQFtvXnCgS6DHJLFZtDkZWh/Fl7DTLmkxA==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-ref-node-data-type/-/uui-ref-node-data-type-1.10.0-rc.0.tgz", + "integrity": "sha512-JcnQpA7AXYpIpfmUeMxnUpmRYBVpZxIqPJDUkGNh6vWbaxbhdzzTUpvemOG17tpE2A5QvslVK/5IH5EAF7EcCA==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0", - "@umbraco-ui/uui-ref-node": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0", + "@umbraco-ui/uui-ref-node": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-ref-node-document-type": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-ref-node-document-type/-/uui-ref-node-document-type-1.9.0.tgz", - "integrity": "sha512-Fe2nEZyAMvUocYBBLl9+LJgXKLtbyxDK8HjHP4pvnZ3a8daNcj0LoquKoFGTSbRHZpxz6cZ7TPDpsgU0IhLLew==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-ref-node-document-type/-/uui-ref-node-document-type-1.10.0-rc.0.tgz", + "integrity": "sha512-2CsBeWayG+taUgukHLRm1wYnQ3kSRxBMnSktM3b+T1LwcRt/X2WH6F+GuLrggkOnC4a8fYczcCnpzHrEcM+emA==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0", - "@umbraco-ui/uui-ref-node": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0", + "@umbraco-ui/uui-ref-node": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-ref-node-form": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-ref-node-form/-/uui-ref-node-form-1.9.0.tgz", - "integrity": "sha512-NAYJ9o0e9NBh54qBP2RJXY2c1SR7h3kTAaRnyQ3x1ta4UL1Dqfud9Tgw3ZMI2oF/O0PAkiuCgqQAgGLYMK6dkw==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-ref-node-form/-/uui-ref-node-form-1.10.0-rc.0.tgz", + "integrity": "sha512-kuwm0/dDoCe0exGqRHgvxy042XCu1T+Q1fWw8PrFHqZOnRm/9vr36+sAT/0OifsJuVom4PTf4gjvh4kn+2NpFw==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0", - "@umbraco-ui/uui-ref-node": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0", + "@umbraco-ui/uui-ref-node": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-ref-node-member": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-ref-node-member/-/uui-ref-node-member-1.9.0.tgz", - "integrity": "sha512-Q/yNYwU2ChJfJmTQKFSHNdd9LoKL4FjMFqkNoXKaOw5Qo6TnY8KBs6Eyk1mh6F+bXL/ElQHbPbmpRUfUeAsT4A==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-ref-node-member/-/uui-ref-node-member-1.10.0-rc.0.tgz", + "integrity": "sha512-F/zswnmdlHKBA4g6SWHiX60FwYFZ1dta7TqmbWPgm/xuTRAyL6tFXvThXVUteBPXoizYlCVI2vzq6slVgxDsTw==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0", - "@umbraco-ui/uui-ref-node": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0", + "@umbraco-ui/uui-ref-node": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-ref-node-package": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-ref-node-package/-/uui-ref-node-package-1.9.0.tgz", - "integrity": "sha512-pI7nj61zIprqST0qtFxVfOehyyDZG6jLRGeR1tpKnaMtfkt3fzQHzeMGNPTxr+TfwMx11AIiPK5/GddL4xcBqA==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-ref-node-package/-/uui-ref-node-package-1.10.0-rc.0.tgz", + "integrity": "sha512-rjhoXKp7gS7t3gT0qgfBdfRthy7v9jkr2uPHNtZOjqO94FUBewUho74VAOoXLMI0yctzVFL0RFoBdGiUGZFMVg==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0", - "@umbraco-ui/uui-ref-node": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0", + "@umbraco-ui/uui-ref-node": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-ref-node-user": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-ref-node-user/-/uui-ref-node-user-1.9.0.tgz", - "integrity": "sha512-vF5YDQeKhWHH++DZvG6hzfj+tGlxBpK6fqbS5DIL39MDR5i9CJy/+5ON/S1wOecDH0hjnUscYZRd5kTwzV7Pwg==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-ref-node-user/-/uui-ref-node-user-1.10.0-rc.0.tgz", + "integrity": "sha512-ko8SQ9hjCi0lamiqdyh3U+pfxiuJQK29wFgb685++nJRSbEWdAiNE1V6fpOziW5bRK/IY3FZ4YlY3I2iP2XHFQ==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0", - "@umbraco-ui/uui-ref-node": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0", + "@umbraco-ui/uui-ref-node": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-scroll-container": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-scroll-container/-/uui-scroll-container-1.9.0.tgz", - "integrity": "sha512-QXzGbFLZMJ5WUffNgiUyIIpGoOjv1JTGYRoRneWaygcwYdLmVY0mgre+6YVY0JfxkF/qMCT2BzWGK4ulmzGsmA==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-scroll-container/-/uui-scroll-container-1.10.0-rc.0.tgz", + "integrity": "sha512-KCfLvYzYXeOIZpnuE8LTyX7iUSCSQ+5SCUYwxLHcpYXUY89jCQyboV+oilKgf9QjsYdjDP5E9Wv7ALD5K+mNgg==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-select": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-select/-/uui-select-1.9.0.tgz", - "integrity": "sha512-3wIrYb54w94LL1VmmmEIw/5AIn/RduQK4anz5kmqx6HQBbU13hEvSXC7ENEBrvbYXopWchN6nWPUjBLL+U3HrA==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-select/-/uui-select-1.10.0-rc.0.tgz", + "integrity": "sha512-NsJP4crr71ZH6dAFXvBFzmjsjr4V2ANvXVTbZDczr6mXwx8mzXqrzQbk7FzRzChAYQTm+SVbBkg6IkU8NpTipg==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-slider": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-slider/-/uui-slider-1.9.0.tgz", - "integrity": "sha512-++a47cE7CbuXjTHfPO1mRTRozkbFG68WUtc0gF7FoEYTkVAYaWCgXQkH8o68bLZ1PSNLjA3bJzMJaiWyuytqsA==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-slider/-/uui-slider-1.10.0-rc.0.tgz", + "integrity": "sha512-SPQItCmki/lfcUksK6dMgwUm6bH958QspRv2b5mZhyM69E1CSN09IhqAuEHAKngGl+VJv8hDmQo4fCth3EpZhA==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-symbol-expand": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-symbol-expand/-/uui-symbol-expand-1.9.0.tgz", - "integrity": "sha512-qqx2IUTqK/dKnB0S6Xh/aLUTI0As6ucns1GnvjSwqgYDbvPGkZn9cmVdeT1u/kL0ka6ZzIgzCbN97qCg08PfIA==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-symbol-expand/-/uui-symbol-expand-1.10.0-rc.0.tgz", + "integrity": "sha512-8qsL0xn4riumBMA5qmv7c6V0vL6FZmGRB/sAAyzDJqryDOsAWf++LjkROqjTyZcxtnMPYjwXVl9CBVRmW5W2PQ==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-symbol-file": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-symbol-file/-/uui-symbol-file-1.9.0.tgz", - "integrity": "sha512-J7FnTlm4fHg4JYrcHmEnuFBH8r18lXuxitBnQXIPYnsaxl0ByOM3GtsIfcDxgcvnICd5OLfH3u78Ce5GuwS24g==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-symbol-file/-/uui-symbol-file-1.10.0-rc.0.tgz", + "integrity": "sha512-fWeZkiH1sROc9gSYwd4CPCX4+gnt0OmADwqTOZNcvxe0h8wrmcCrtxQ37tZLGOsfA2PAjtFZtOMe1QWZF2veNw==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-symbol-file-dropzone": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-symbol-file-dropzone/-/uui-symbol-file-dropzone-1.9.0.tgz", - "integrity": "sha512-wSS9sGJqdCayx077rt0RswRT9VyzZnQE9rHMs/mxCpvaU9hFRDv6Rm4/Y7UUo2sDqvfjVOCmIYrdrJN9/lXLaQ==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-symbol-file-dropzone/-/uui-symbol-file-dropzone-1.10.0-rc.0.tgz", + "integrity": "sha512-3DF/wVIZIiHNTDJiN0gRoXpmBuFtC20pNqm9Bdzuf8oP6QO7SD1LBJM1PPpCe7kDFtdJeELJlPhLEsGUD7TOJw==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-symbol-file-thumbnail": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-symbol-file-thumbnail/-/uui-symbol-file-thumbnail-1.9.0.tgz", - "integrity": "sha512-sNyqcxj8hmUlJ4PgzQ//6a7Uhlz0XNwbP09//sZr7c4mpno6uvqrvKzOH7cV0FFjLaGJVM1ck/7jTcETbdoh4A==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-symbol-file-thumbnail/-/uui-symbol-file-thumbnail-1.10.0-rc.0.tgz", + "integrity": "sha512-xA/XY6c7uHohZ2+v0tCuvqjsGmzTu+C9slWftR2Es2yS92MQIKNkYM435Nt1cY+pD1jJbXoFnbUY749129NKlw==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-symbol-folder": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-symbol-folder/-/uui-symbol-folder-1.9.0.tgz", - "integrity": "sha512-ASLORLBwV5QHPBW+do0usOAUHPGKFhYTE44OMX4ZcGbu4oybHNOK1AmXQmWROgzF5bGAYiJkW1fIWWXvzRO+AA==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-symbol-folder/-/uui-symbol-folder-1.10.0-rc.0.tgz", + "integrity": "sha512-aTB432He1wSFdIPDKSse2OagOT8C2ElMS0iPrf7Un3hHmc7MJSwBX8wJ9qmTzEzlRKlnf0HvijG2iwoUjXLb8Q==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-symbol-lock": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-symbol-lock/-/uui-symbol-lock-1.9.0.tgz", - "integrity": "sha512-bkHG9SOmUrjY4VHXjcZnJ1NpMk4ddcpTSnXn4temIIIYsX6H5itKC+js5rYQmUp/C/dmQ1bAMcK5kk1XYOrqtw==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-symbol-lock/-/uui-symbol-lock-1.10.0-rc.0.tgz", + "integrity": "sha512-VtJdbVVxtIRk5ALeeotwtxW3zgM7knxQXq76jBbwy3FzzCQTtBOQXsijQyCROPDaSsZ8YGOKB0n9ivPBXGjsGg==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-symbol-more": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-symbol-more/-/uui-symbol-more-1.9.0.tgz", - "integrity": "sha512-awCpspMwYRXARsKfwKHuzEwZX/pOInG6L6XQJ9sXhLZ4cPVErw1BWMjmTu2zZa/zOp+j9xlfgj4cTSYsl5wvnw==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-symbol-more/-/uui-symbol-more-1.10.0-rc.0.tgz", + "integrity": "sha512-QSFlkgwX7gAY/xw9FdNPIuQjm0yTcfHVny7dFRNi1N01EM1+VGPHV7n7gPwSeu2m5f99P5Kf0YdjDkkkIPc84A==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-symbol-sort": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-symbol-sort/-/uui-symbol-sort-1.9.0.tgz", - "integrity": "sha512-nkU9cMCyQ3MCsYJXaDP5kVI5z6THaDSBxaoOIddbpqQqxJ92VT8ehJ8kxepOG2ivuTvkYq3M8khWmIvwiuD5TA==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-symbol-sort/-/uui-symbol-sort-1.10.0-rc.0.tgz", + "integrity": "sha512-VUelA+lzP5Kom/KfbnzdUErXFa+Kz/tSR6ao879GIE+TtQ3ntEW1BvwQC0LkRzZALQL5MRdSgIxM9fYIjQPD4Q==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-table": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-table/-/uui-table-1.9.0.tgz", - "integrity": "sha512-ai2gRtsqiztU0VvRpkYoyCgKl7Pfpv8XriXSgIX1S9+GPcysh3yD7owZkLzToiiTKLdTajYsqCo8E0TocoXdKQ==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-table/-/uui-table-1.10.0-rc.0.tgz", + "integrity": "sha512-m3YjJ6lvHvkstzvVSdWg7jCiN/zezqFSGzcfjkVrxGjyiIyaFvOHkqByH6EL37FlJIV9eoIVPo11y2ldRpPe5A==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-tabs": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-tabs/-/uui-tabs-1.9.0.tgz", - "integrity": "sha512-96GFFi6ale9hBp44qPTFiXZPsZ2QHRrvQElEwh6f5l23BGh3vqdzRtrSRsdt88xMAw2Q7YYN1jiEVxyYwv2LDQ==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-tabs/-/uui-tabs-1.10.0-rc.0.tgz", + "integrity": "sha512-FxUJ8kOT0UogS6PD2gdB+0MbXR2LY7X/dtSJuARvR08kjH6K7mDu7fd4q5v1FPd0ZAqNII/wzWDue4n+1z+fJA==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0", - "@umbraco-ui/uui-button": "1.9.0", - "@umbraco-ui/uui-popover-container": "1.9.0", - "@umbraco-ui/uui-symbol-more": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0", + "@umbraco-ui/uui-button": "1.10.0-rc.0", + "@umbraco-ui/uui-popover-container": "1.10.0-rc.0", + "@umbraco-ui/uui-symbol-more": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-tag": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-tag/-/uui-tag-1.9.0.tgz", - "integrity": "sha512-yRwfeH6CQdZocg8mAP72CpfG55Nxeczp+XWBDpltQ4inrlk35ej5rGc8Ax1Yx9aVFpl+mk0RBjtLJNgB/cb6mQ==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-tag/-/uui-tag-1.10.0-rc.0.tgz", + "integrity": "sha512-Zl5fAA5pZpBOsxLZyWeZAnYdXxevZWkChJnFoOqHK7Vhm8ra+AUHaH7U7zSZbvk9ef8S5l2+Km3yYXkEmMGrGQ==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-textarea": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-textarea/-/uui-textarea-1.9.0.tgz", - "integrity": "sha512-4OVSB/0LS3QUNXCUROPlLiPWVvTxZnlW+5dkO6GxR98mm2JVHk6z1g5hQVLT3LzKBHcqmwGXfgezqvFiwKFvFQ==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-textarea/-/uui-textarea-1.10.0-rc.0.tgz", + "integrity": "sha512-CRfg4rLxymAHFsvZheXbSLSCJfmqFE2akaRMQcbPUJjrNsw8vF+xEH0SbSV4yMhJoF+6slA9qzqXSswFBeEJ1Q==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-toast-notification": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-toast-notification/-/uui-toast-notification-1.9.0.tgz", - "integrity": "sha512-lAjOE1iRdfZdht4z5G+ekGynNzTIK9e6oGCqdyxbnSLxyMhshXqxOFQrzFfcPz0crnDjyP+92TlnwB6CbR2NkQ==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-toast-notification/-/uui-toast-notification-1.10.0-rc.0.tgz", + "integrity": "sha512-th6zzSwsmmTldIYnzmFE4q6L+vmCqNzWnZOVxu13i43mBA5Hu3yKZP4ABsD1tNA+7VjMIOMO/4dql0vkEm/Ohw==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0", - "@umbraco-ui/uui-button": "1.9.0", - "@umbraco-ui/uui-css": "1.9.0", - "@umbraco-ui/uui-icon": "1.9.0", - "@umbraco-ui/uui-icon-registry-essential": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0", + "@umbraco-ui/uui-button": "1.10.0-rc.0", + "@umbraco-ui/uui-css": "1.10.0-rc.0", + "@umbraco-ui/uui-icon": "1.10.0-rc.0", + "@umbraco-ui/uui-icon-registry-essential": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-toast-notification-container": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-toast-notification-container/-/uui-toast-notification-container-1.9.0.tgz", - "integrity": "sha512-Suib+5z8jNdX0jOGbwKdPUXcPSHLC+WtrSBi0yHYMyXpeMiBfIKvTsZEncVTJQV/XvXViIDMircVfWbxKtQnHA==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-toast-notification-container/-/uui-toast-notification-container-1.10.0-rc.0.tgz", + "integrity": "sha512-Zlv6O3M5KbbxYsJ4gwBNxrZzuLqZxE0mIzRMNNMEGlh6nfa8DDbGRfMlIQUK1O8F2tO/F1DtA2bw4OOXFtMcpA==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0", - "@umbraco-ui/uui-toast-notification": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0", + "@umbraco-ui/uui-toast-notification": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-toast-notification-layout": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-toast-notification-layout/-/uui-toast-notification-layout-1.9.0.tgz", - "integrity": "sha512-h+Nap1g4hZ/2gZlGPURRfgTme8+qegsNsQ7+12s1ETM+bkKftqNBlT2otUZ5MbTbhOI8uxWSTJBGRIlgvgUB8A==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-toast-notification-layout/-/uui-toast-notification-layout-1.10.0-rc.0.tgz", + "integrity": "sha512-5I9Tr+0VaH2LZ9Wlh6VlxPl9DQedFBNsEfFPKcuvBIuo77XZdKHwf/cgOzf0cyoyyrZPljIzwiCOW6oGd+aeaA==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0", - "@umbraco-ui/uui-css": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0", + "@umbraco-ui/uui-css": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-toggle": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-toggle/-/uui-toggle-1.9.0.tgz", - "integrity": "sha512-6uJy7WFsNG3OlO4n7E2hq3y5jHuab4VF6WzoBFJde/Znb5noMZa2WrqtKmFIWpp0BT9V6aKOhxiKk+q1JYXeZw==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-toggle/-/uui-toggle-1.10.0-rc.0.tgz", + "integrity": "sha512-VFS5THivr1OQIJpcF0i/OFwIt/1+sCkN9TnWnz6WHdwczKnLmq7/FmdOfjJ3W7EadmWfLj2dHTsxIUnHP1obtA==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0", - "@umbraco-ui/uui-boolean-input": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0", + "@umbraco-ui/uui-boolean-input": "1.10.0-rc.0" } }, "node_modules/@umbraco-ui/uui-visually-hidden": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-visually-hidden/-/uui-visually-hidden-1.9.0.tgz", - "integrity": "sha512-NyTWgBocRMcHc21Uy0b/ACWpsx0cgyxND4sZJTXTTciB1CPOl2rKQpKChNkChn9XS3sBRPOJ+86CUEIZ4K14qQ==", + "version": "1.10.0-rc.0", + "resolved": "https://registry.npmjs.org/@umbraco-ui/uui-visually-hidden/-/uui-visually-hidden-1.10.0-rc.0.tgz", + "integrity": "sha512-l03O3u0QlsuuHmVwZuKrByePXweJQi1kw0wgTj6v1pzvZY0rSo7NFmwWLOGIteBLsRBUjH7mAUqeYecN4CQAFw==", "dependencies": { - "@umbraco-ui/uui-base": "1.9.0" + "@umbraco-ui/uui-base": "1.10.0-rc.0" } }, "node_modules/@vue/compiler-core": { @@ -23120,7 +23120,9 @@ "src/packages/static-file": { "name": "@umbraco-backoffice/static-file" }, - "src/packages/sysinfo": {}, + "src/packages/sysinfo": { + "name": "@umbraco-backoffice/sysinfo" + }, "src/packages/tags": { "name": "@umbraco-backoffice/tag" }, diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json index 954ca87fe5..9270456b65 100644 --- a/src/Umbraco.Web.UI.Client/package.json +++ b/src/Umbraco.Web.UI.Client/package.json @@ -188,8 +188,8 @@ "@types/diff": "^5.2.1", "@types/dompurify": "^3.0.5", "@types/uuid": "^10.0.0", - "@umbraco-ui/uui": "^1.9.0", - "@umbraco-ui/uui-css": "^1.9.0", + "@umbraco-ui/uui": "^v1.10.0-rc.0", + "@umbraco-ui/uui-css": "^v1.10.0-rc.0", "base64-js": "^1.5.1", "diff": "^5.2.0", "dompurify": "^3.1.6", From 2bb49ca77cdca78ca3acee05ba9fe9ce0d5ce003 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Thu, 12 Sep 2024 12:59:12 +0200 Subject: [PATCH 19/43] UUI version corrections --- .../src/mocks/data/utils/entity/entity-tree.manager.ts | 2 +- .../components/ref-list-block/ref-list-block.element.ts | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) 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 8195af02df..fc6a0c7334 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 @@ -62,7 +62,7 @@ export class UmbMockEntityTreeManager = []; ids.forEach((id) => { 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 38d4ea5181..925fd07187 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 @@ -47,11 +47,10 @@ export class UmbRefListBlockElement extends UmbLitElement { } override render() { - // TODO: apply `slot="name"` to the `umb-ufm-render` element, when UUI supports it. [NL] return html` - + `; } From 7cf36be9db68d7fa4c7a46714367c33ebfb55b9d Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Thu, 12 Sep 2024 13:35:27 +0200 Subject: [PATCH 20/43] chore: change text based on actual texts coming from Our --- .../src/mocks/handlers/server.handlers.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 2aadc06168..38c1d1626c 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 @@ -56,9 +56,9 @@ export const serverInformationHandlers = [ // Respond with a 200 status code ctx.status(200), ctx.json({ - type: 'Major', - comment: 'A new version is available', - url: 'https://our.umbraco.com/download/releases', + type: 'Minor', + comment: "14.2.0.0 is released. Upgrade today - it's free!", + url: 'http://our.umbraco.org/contribute/releases/1420', }), ); }), @@ -67,8 +67,8 @@ export const serverInformationHandlers = [ // Respond with a 200 status code ctx.status(200), ctx.json({ - version: '14.0.0-preview004', - assemblyVersion: '14.0.0-preview004', + version: '14.0.0', + assemblyVersion: '14.0.0', baseUtcOffset: '01:00:00', runtimeMode: RuntimeModeModel.BACKOFFICE_DEVELOPMENT, }), From 7fb148baaa44045cb9bf0ccd2ee7236dc0e2783b Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Thu, 12 Sep 2024 13:39:31 +0200 Subject: [PATCH 21/43] chore: update link to sonarcloud is happy --- src/Umbraco.Web.UI.Client/src/mocks/handlers/server.handlers.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 38c1d1626c..73f733310e 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 @@ -58,7 +58,7 @@ export const serverInformationHandlers = [ ctx.json({ type: 'Minor', comment: "14.2.0.0 is released. Upgrade today - it's free!", - url: 'http://our.umbraco.org/contribute/releases/1420', + url: 'https://our.umbraco.com/download/releases/1420', }), ); }), From bdc369985c738a6826ce4a804f7aaabf851bfe6e Mon Sep 17 00:00:00 2001 From: leekelleher Date: Thu, 12 Sep 2024 16:29:13 +0100 Subject: [PATCH 22/43] Tweaked "read more" button icon to appear next to the label, rather than below it. --- .../sysinfo/components/new-version.element.ts | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/sysinfo/components/new-version.element.ts b/src/Umbraco.Web.UI.Client/src/packages/sysinfo/components/new-version.element.ts index 616b1b347c..b12c0e7b23 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/sysinfo/components/new-version.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/sysinfo/components/new-version.element.ts @@ -1,6 +1,6 @@ import { UmbSysinfoRepository } from '../repository/sysinfo.repository.js'; import type { UmbServerUpgradeCheck } from '../types.js'; -import { customElement, html, state, when } from '@umbraco-cms/backoffice/external/lit'; +import { css, customElement, html, state, when } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { UmbModalBaseElement } from '@umbraco-cms/backoffice/modal'; @@ -41,7 +41,7 @@ export class UmbNewVersionElement extends UmbModalBaseElement { color="positive" label=${this.localize.term('general_readMore')}> Read more - + ` : ''} @@ -49,7 +49,14 @@ export class UmbNewVersionElement extends UmbModalBaseElement { `; } - static override readonly styles = [UmbTextStyles]; + static override readonly styles = [ + UmbTextStyles, + css` + umb-icon { + margin-left: var(--uui-size-2); + } + `, + ]; } export default UmbNewVersionElement; From 457dc2134c8930a9c02ed046d74b230c7317ac08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Fri, 13 Sep 2024 09:58:17 +0200 Subject: [PATCH 23/43] hasProperties condition --- .../structure/content-type-structure-manager.class.ts | 4 ++++ .../has-properties/content-has-properties.condition.ts | 7 +++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/structure/content-type-structure-manager.class.ts b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/structure/content-type-structure-manager.class.ts index 796a6a0801..f723bafef3 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/structure/content-type-structure-manager.class.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/structure/content-type-structure-manager.class.ts @@ -54,6 +54,10 @@ export class UmbContentTypeStructureManager< // Notice this may need to use getValue to avoid resetting it self. [NL] return contentTypes.flatMap((x) => x.properties ?? []); }); + readonly contentTypeHasProperties = this.#contentTypes.asObservablePart((contentTypes) => { + // Notice this may need to use getValue to avoid resetting it self. [NL] + return contentTypes.some((x) => x.properties.length > 0); + }); readonly contentTypePropertyAliases = this.#contentTypes.asObservablePart((contentTypes) => { return contentTypes.flatMap((x) => x.properties ?? []).map((x) => x.alias); }); diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/content/workspace/views/edit/conditions/has-properties/content-has-properties.condition.ts b/src/Umbraco.Web.UI.Client/src/packages/core/content/workspace/views/edit/conditions/has-properties/content-has-properties.condition.ts index 34d6ebe6aa..b52675e06e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/content/workspace/views/edit/conditions/has-properties/content-has-properties.condition.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/content/workspace/views/edit/conditions/has-properties/content-has-properties.condition.ts @@ -16,12 +16,11 @@ export class UmbContentHasPropertiesWorkspaceCondition this.consumeContext(UMB_CONTENT_WORKSPACE_CONTEXT, (context) => { this.observe( - context.structure.contentTypes, - (contentTypes) => { - const hasProperties = contentTypes.some((contentType) => contentType.properties.length > 0); + context.structure.contentTypeHasProperties, + (hasProperties) => { this.permitted = hasProperties; }, - 'contentTypesObserver', + 'hasPropertiesObserver', ); }); } From 5a5cdc14456eb52cb420412c984d56f064acb7ae Mon Sep 17 00:00:00 2001 From: Lee Kelleher Date: Fri, 13 Sep 2024 09:07:35 +0100 Subject: [PATCH 24/43] Bugfix: RTE TinyMCE data-type sorts configuration field order (#2279) TinyMCE data-type adds weight to config --- .../property-editors/tiny-mce/Umbraco.RichText.ts | 15 +++++++++------ .../property-editors/tiny-mce/manifests.ts | 7 +++++++ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/tiny-mce/property-editors/tiny-mce/Umbraco.RichText.ts b/src/Umbraco.Web.UI.Client/src/packages/tiny-mce/property-editors/tiny-mce/Umbraco.RichText.ts index 3da9f66b76..0e906dc699 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/tiny-mce/property-editors/tiny-mce/Umbraco.RichText.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/tiny-mce/property-editors/tiny-mce/Umbraco.RichText.ts @@ -8,23 +8,26 @@ export const manifest: ManifestPropertyEditorSchema = { defaultPropertyEditorUiAlias: 'Umb.PropertyEditorUi.TinyMCE', settings: { properties: [ + { + alias: 'blocks', + label: 'Available Blocks', + description: 'Define the available blocks.', + propertyEditorUiAlias: 'Umb.PropertyEditorUi.BlockRteTypeConfiguration', + weight: 80, + }, { alias: 'mediaParentId', label: 'Image Upload Folder', description: 'Choose the upload location of pasted images', propertyEditorUiAlias: 'Umb.PropertyEditorUi.MediaEntityPicker', config: [{ alias: 'validationLimit', value: { min: 0, max: 1 } }], + weight: 90, }, { alias: 'ignoreUserStartNodes', label: 'Ignore User Start Nodes', propertyEditorUiAlias: 'Umb.PropertyEditorUi.Toggle', - }, - { - alias: 'blocks', - label: 'Available Blocks', - description: 'Define the available blocks.', - propertyEditorUiAlias: 'Umb.PropertyEditorUi.BlockRteTypeConfiguration', + weight: 100, }, ], }, diff --git a/src/Umbraco.Web.UI.Client/src/packages/tiny-mce/property-editors/tiny-mce/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/tiny-mce/property-editors/tiny-mce/manifests.ts index 3dc820a374..7b970e23d6 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/tiny-mce/property-editors/tiny-mce/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/tiny-mce/property-editors/tiny-mce/manifests.ts @@ -22,6 +22,7 @@ const manifest: ManifestPropertyEditorUi = { label: 'Toolbar', description: 'Pick the toolbar options that should be available when editing', propertyEditorUiAlias: 'Umb.PropertyEditorUI.TinyMCE.ToolbarConfiguration', + weight: 10, config: [ { alias: 'toolbar', @@ -68,18 +69,21 @@ const manifest: ManifestPropertyEditorUi = { label: 'Stylesheets', description: 'Pick the stylesheets whose editor styles should be available when editing', propertyEditorUiAlias: 'Umb.PropertyEditorUI.TinyMCE.StylesheetsConfiguration', + weight: 20, }, { alias: 'dimensions', label: 'Dimensions', description: 'Set the editor dimensions', propertyEditorUiAlias: 'Umb.PropertyEditorUI.TinyMCE.DimensionsConfiguration', + weight: 30, }, { alias: 'maxImageSize', label: 'Maximum size for inserted images', description: 'Maximum width or height - enter 0 to disable resizing', propertyEditorUiAlias: 'Umb.PropertyEditorUI.TinyMCE.MaxImageSizeConfiguration', + weight: 40, }, { alias: 'mode', @@ -87,17 +91,20 @@ const manifest: ManifestPropertyEditorUi = { description: 'Select the mode for the editor', propertyEditorUiAlias: 'Umb.PropertyEditorUi.RadioButtonList', config: [{ alias: 'items', value: ['Classic', 'Inline'] }], + weight: 50, }, { alias: 'overlaySize', label: 'Overlay Size', description: 'Select the width of the overlay (link picker)', propertyEditorUiAlias: 'Umb.PropertyEditorUi.OverlaySize', + weight: 81, }, { alias: 'hideLabel', label: 'Hide Label', propertyEditorUiAlias: 'Umb.PropertyEditorUi.Toggle', + weight: 82, }, ], defaultData: [ From 5b44d2f104a3d59af5056fc6ff42d6d820ddce38 Mon Sep 17 00:00:00 2001 From: Lan Nguyen Thuy Date: Fri, 13 Sep 2024 15:10:59 +0700 Subject: [PATCH 25/43] Fix bug can not login after remove ui culture of user --- .../ui-culture-input.element.ts | 30 +++++++++---------- 1 file changed, 14 insertions(+), 16 deletions(-) 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 f19e040eef..813fd1050c 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 @@ -1,6 +1,6 @@ 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 type { UUISelectEvent } from '@umbraco-cms/backoffice/external/uui'; import { UUIFormControlMixin } from '@umbraco-cms/backoffice/external/uui'; import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { ManifestLocalization } from '@umbraco-cms/backoffice/extension-registry'; @@ -59,24 +59,22 @@ export class UmbUiCultureInputElement extends UUIFormControlMixin(UmbLitElement, return this._selectElement; } - #onChange(event: UUIComboboxEvent) { - event.stopPropagation(); - const target = event.target as UUIComboboxElement; - - if (typeof target?.value === 'string') { - this.value = target.value; - this.dispatchEvent(new UmbChangeEvent()); - } + #onCustomValidationChange(event: UUISelectEvent) { + this.value = event.target.value.toString(); + this.dispatchEvent(new UmbChangeEvent()); } override render() { - return html` - - ${this._options.map( - (option) => html`${option.name}`, - )} - - `; + return html` + ({ + name: e.name, + value: e.value, + selected: e.value == this.value + }))}> + `; } static override styles = [ From 5f05ced69c9aa609471d34051cd7a1b4949e7336 Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Fri, 13 Sep 2024 10:15:20 +0200 Subject: [PATCH 26/43] test: insert a timeout for flaky test --- .../src/packages/core/sorter/sorter.controller.test.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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 index 5e2e200699..74242d6063 100644 --- 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 @@ -148,10 +148,14 @@ describe('UmbSorterController', () => { }); describe('enable', () => { - it('sets all allowed items to draggable', () => { - // [NL] I have experienced an issue with this test, it may need a little delay before testing for this. As the test relies on DOM. + it('sets all allowed items to draggable', async () => { const items = element.getSortableItems(); expect(items.length).to.equal(3); + + await aTimeout(100); + await element.updateComplete; + + // Expect all items to be draggable items.forEach((item) => { expect(item.draggable).to.be.true; }); From b49bd9ffbb7823bd01e2725e46b8ca298c8def3f Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Fri, 13 Sep 2024 13:18:49 +0200 Subject: [PATCH 27/43] move collection extension manifests into collection module --- .../block-editor-custom-view.extension.ts | 2 +- .../collection-action-button.element.ts | 3 +- .../collection-view.manager.test.ts | 2 +- .../collection/collection-view.manager.ts | 2 +- .../core/collection/collection.element.ts | 2 +- .../collection-view-bundle.element.ts | 2 +- .../default/collection-default.context.ts | 3 +- .../collection-action.extension.ts} | 8 ++- .../extensions/collection-view.extension.ts} | 8 ++- .../extensions/collection.extension.ts} | 8 ++- .../core/collection/extensions/index.ts | 3 + .../src/packages/core/collection/index.ts | 6 +- .../src/packages/core/collection/types.ts | 4 +- .../collection/manifests.ts | 3 +- .../collection/views/manifests.ts | 3 +- .../extension-registry/conditions/index.ts | 6 +- .../core/extension-registry/models/index.ts | 9 --- .../data-type/collection/manifests.ts | 22 +++--- .../dictionary/collection/action/manifests.ts | 3 +- .../dictionary/collection/manifests.ts | 4 +- .../dictionary/collection/views/manifests.ts | 37 +++++----- ...eate-document-collection-action.element.ts | 2 +- .../documents/collection/action/manifests.ts | 3 +- .../documents/collection/manifests.ts | 4 +- .../documents/collection/views/manifests.ts | 72 +++++++++---------- .../language/collection/action/manifests.ts | 3 +- .../user/user/collection/views/manifests.ts | 3 +- .../invite/collection-action/manifests.ts | 37 +++++----- .../webhook/collection/action/manifests.ts | 3 +- .../packages/webhook/collection/manifests.ts | 3 +- .../webhook/collection/views/manifests.ts | 3 +- 31 files changed, 148 insertions(+), 125 deletions(-) rename src/Umbraco.Web.UI.Client/src/packages/core/{extension-registry/models/collection-action.model.ts => collection/extensions/collection-action.extension.ts} (73%) rename src/Umbraco.Web.UI.Client/src/packages/core/{extension-registry/models/collection-view.model.ts => collection/extensions/collection-view.extension.ts} (82%) rename src/Umbraco.Web.UI.Client/src/packages/core/{extension-registry/models/collection.models.ts => collection/extensions/collection.extension.ts} (65%) create mode 100644 src/Umbraco.Web.UI.Client/src/packages/core/collection/extensions/index.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-custom-view/block-editor-custom-view.extension.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-custom-view/block-editor-custom-view.extension.ts index 2212ae53c1..d41818eae6 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block-custom-view/block-editor-custom-view.extension.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-custom-view/block-editor-custom-view.extension.ts @@ -21,6 +21,6 @@ export interface ManifestBlockEditorCustomView extends ManifestElement { @@ -37,3 +37,9 @@ export interface ConditionsCollectionView { */ entityType: string; } + +declare global { + interface UmbExtensionManifestMap { + umbCollectionView: ManifestCollectionView; + } +} diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/collection.models.ts b/src/Umbraco.Web.UI.Client/src/packages/core/collection/extensions/collection.extension.ts similarity index 65% rename from src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/collection.models.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/collection/extensions/collection.extension.ts index c3a5b4e16b..3147b96874 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/collection.models.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/collection/extensions/collection.extension.ts @@ -1,4 +1,4 @@ -import type { ConditionTypes } from '../conditions/types.js'; +import type { ConditionTypes } from '@umbraco-cms/backoffice/extension-registry'; import type { ManifestElementAndApi, ManifestWithDynamicConditions } from '@umbraco-cms/backoffice/extension-api'; export interface ManifestCollection extends ManifestElementAndApi, ManifestWithDynamicConditions { @@ -9,3 +9,9 @@ export interface ManifestCollection extends ManifestElementAndApi, ManifestWithD export interface MetaCollection { repositoryAlias: string; } + +declare global { + interface UmbExtensionManifestMap { + umbCollection: ManifestCollection; + } +} diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/collection/extensions/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/collection/extensions/index.ts new file mode 100644 index 0000000000..d1ca9ecbb1 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/core/collection/extensions/index.ts @@ -0,0 +1,3 @@ +export * from './collection-action.extension.js'; +export * from './collection-view.extension.js'; +export * from './collection.extension.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/collection/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/collection/index.ts index e3b5fac4d8..ba4eedfb8a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/collection/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/collection/index.ts @@ -10,14 +10,10 @@ export * from './collection-item-picker-modal/index.js'; export * from './default/collection-default.context.js'; export * from './default/collection-default.context-token.js'; export * from './collection-filter-model.interface.js'; +export * from './types.js'; export { UMB_COLLECTION_ALIAS_CONDITION } from './collection-alias.manifest.js'; export { UMB_COLLECTION_BULK_ACTION_PERMISSION_CONDITION } from './collection-bulk-action-permission.manifest.js'; export { UmbCollectionActionElement, UmbCollectionActionBase } from './action/index.js'; export type { UmbCollectionDataSource, UmbCollectionRepository } from './repository/index.js'; -export type { - UmbCollectionBulkActionPermissions, - UmbCollectionConfiguration, - UmbCollectionColumnConfiguration, -} from './types.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/collection/types.ts b/src/Umbraco.Web.UI.Client/src/packages/core/collection/types.ts index 822d309abe..eccd1bcfc4 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/collection/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/collection/types.ts @@ -1,5 +1,5 @@ +import type { ManifestCollection } from './extensions/index.js'; import type { Observable } from '@umbraco-cms/backoffice/external/rxjs'; -import type { ManifestCollection } from '@umbraco-cms/backoffice/extension-registry'; import type { UmbPaginationManager } from '@umbraco-cms/backoffice/utils'; export interface UmbCollectionBulkActionPermissions { @@ -47,3 +47,5 @@ export interface UmbCollectionContext { items: Observable; totalItems: Observable; } + +export * from './extensions/index.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/collection/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/collection/manifests.ts index 68b0f602fd..3d2fcf1205 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/collection/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/collection/manifests.ts @@ -1,7 +1,8 @@ import { UMB_EXTENSION_COLLECTION_REPOSITORY_ALIAS } from './repository/index.js'; import { manifests as collectionRepositoryManifests } from './repository/manifests.js'; import { manifests as collectionViewManifests } from './views/manifests.js'; -import type { ManifestCollection, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestCollection } from '@umbraco-cms/backoffice/collection'; export const UMB_EXTENSION_COLLECTION_ALIAS = 'Umb.Collection.Extension'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/collection/views/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/collection/views/manifests.ts index fd6ee1d9f1..0fd5cf9fef 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/collection/views/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/collection/views/manifests.ts @@ -1,5 +1,6 @@ import { UMB_COLLECTION_ALIAS_CONDITION } from '@umbraco-cms/backoffice/collection'; -import type { ManifestCollectionView, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestCollectionView } from '@umbraco-cms/backoffice/collection'; export const UMB_EXTENSION_TABLE_COLLECTION_VIEW_ALIAS = 'Umb.CollectionView.Extension.Table'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/conditions/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/conditions/index.ts index debe3bb4f9..f58ee1c52c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/conditions/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/conditions/index.ts @@ -1,4 +1,8 @@ export { UmbSwitchCondition } from './switch.condition.js'; export { UmbConditionBase } from './condition-base.controller.js'; -export type { BlockEntryShowContentEditConditionConfig, BlockWorkspaceHasSettingsConditionConfig } from './types.js'; +export type { + BlockEntryShowContentEditConditionConfig, + BlockWorkspaceHasSettingsConditionConfig, + ConditionTypes, +} from './types.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 00fec52d8f..200689de1b 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 @@ -1,6 +1,4 @@ import type { ManifestAuthProvider } from './auth-provider.model.js'; -import type { ManifestCollection } from './collection.models.js'; -import type { ManifestCollectionView } from './collection-view.model.js'; import type { ManifestCurrentUserAction, ManifestCurrentUserActionDefaultKind } from './current-user-action.model.js'; import type { ManifestDashboard } from './dashboard.model.js'; import type { ManifestDashboardCollection } from './dashboard-collection.model.js'; @@ -62,7 +60,6 @@ import type { } from './workspace-view.model.js'; import type { ManifestEntityUserPermission } from './entity-user-permission.model.js'; import type { ManifestGranularUserPermission } from './user-granular-permission.model.js'; -import type { ManifestCollectionAction } from './collection-action.model.js'; import type { ManifestMfaLoginProvider } from './mfa-login-provider.model.js'; import type { ManifestSearchProvider } from './search-provider.model.js'; import type { ManifestSearchResultItem } from './search-result-item.model.js'; @@ -77,9 +74,6 @@ import type { ManifestBase, ManifestBundle, ManifestCondition } from '@umbraco-c export type * from './app-entry-point.model.js'; export type * from './auth-provider.model.js'; export type * from './backoffice-entry-point.model.js'; -export type * from './collection-action.model.js'; -export type * from './collection-view.model.js'; -export type * from './collection.models.js'; export type * from './current-user-action.model.js'; export type * from './dashboard-collection.model.js'; export type * from './dashboard.model.js'; @@ -159,9 +153,6 @@ export type ManifestTypes = | ManifestAuthProvider | ManifestBackofficeEntryPoint | ManifestBundle - | ManifestCollection - | ManifestCollectionAction - | ManifestCollectionView | ManifestCondition | ManifestCurrentUserAction | ManifestCurrentUserActionDefaultKind diff --git a/src/Umbraco.Web.UI.Client/src/packages/data-type/collection/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/collection/manifests.ts index 04c66cab30..27b0beec79 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/data-type/collection/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/data-type/collection/manifests.ts @@ -1,17 +1,17 @@ import { UMB_DATA_TYPE_COLLECTION_REPOSITORY_ALIAS } from './repository/index.js'; import { manifests as collectionRepositoryManifests } from './repository/manifests.js'; -import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; export const UMB_DATA_TYPE_COLLECTION_ALIAS = 'Umb.Collection.DataType'; -const collectionManifest: ManifestTypes = { - type: 'collection', - kind: 'default', - alias: UMB_DATA_TYPE_COLLECTION_ALIAS, - name: 'Data Type Collection', - meta: { - repositoryAlias: UMB_DATA_TYPE_COLLECTION_REPOSITORY_ALIAS, +export const manifests: Array = [ + { + type: 'collection', + kind: 'default', + alias: UMB_DATA_TYPE_COLLECTION_ALIAS, + name: 'Data Type Collection', + meta: { + repositoryAlias: UMB_DATA_TYPE_COLLECTION_REPOSITORY_ALIAS, + }, }, -}; - -export const manifests: Array = [collectionManifest, ...collectionRepositoryManifests]; + ...collectionRepositoryManifests, +]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/collection/action/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/collection/action/manifests.ts index d6b73b5834..71a6ce4b66 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/collection/action/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/collection/action/manifests.ts @@ -1,6 +1,7 @@ import { UMB_DICTIONARY_ROOT_ENTITY_TYPE } from '../../entity.js'; import { UMB_COLLECTION_ALIAS_CONDITION } from '@umbraco-cms/backoffice/collection'; -import type { ManifestCollectionAction, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestCollectionAction } from '@umbraco-cms/backoffice/collection'; export const createManifest: ManifestCollectionAction = { type: 'collectionAction', diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/collection/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/collection/manifests.ts index fc1d1e4ea9..dbab8a757d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/collection/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/collection/manifests.ts @@ -3,7 +3,7 @@ import { manifests as collectionRepositoryManifests } from './repository/manifes import { manifests as collectionViewManifests } from './views/manifests.js'; import { manifests as collectionActionManifests } from './action/manifests.js'; import { UMB_DICTIONARY_COLLECTION_ALIAS } from './constants.js'; -import type { ManifestCollection, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestCollection } from '@umbraco-cms/backoffice/collection'; const collectionManifest: ManifestCollection = { type: 'collection', @@ -15,7 +15,7 @@ const collectionManifest: ManifestCollection = { }, }; -export const manifests: Array = [ +export const manifests: Array = [ collectionManifest, ...collectionRepositoryManifests, ...collectionViewManifests, diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/collection/views/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/collection/views/manifests.ts index cc08e6ff23..71caf94c42 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/collection/views/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/collection/views/manifests.ts @@ -1,23 +1,22 @@ import { UMB_DICTIONARY_TABLE_COLLECTION_VIEW_ALIAS } from './constants.js'; import { UMB_COLLECTION_ALIAS_CONDITION } from '@umbraco-cms/backoffice/collection'; -import type { ManifestCollectionView, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; -const tableCollectionView: ManifestCollectionView = { - type: 'collectionView', - alias: UMB_DICTIONARY_TABLE_COLLECTION_VIEW_ALIAS, - name: 'Dictionary Table Collection View', - element: () => import('./table/dictionary-table-collection-view.element.js'), - meta: { - label: 'Table', - icon: 'icon-list', - pathName: 'table', - }, - conditions: [ - { - alias: UMB_COLLECTION_ALIAS_CONDITION, - match: 'Umb.Collection.Dictionary', +export const manifests: Array = [ + { + type: 'collectionView', + alias: UMB_DICTIONARY_TABLE_COLLECTION_VIEW_ALIAS, + name: 'Dictionary Table Collection View', + element: () => import('./table/dictionary-table-collection-view.element.js'), + meta: { + label: 'Table', + icon: 'icon-list', + pathName: 'table', }, - ], -}; - -export const manifests: Array = [tableCollectionView]; + conditions: [ + { + alias: UMB_COLLECTION_ALIAS_CONDITION, + match: 'Umb.Collection.Dictionary', + }, + ], + }, +]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/action/create-document-collection-action.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/action/create-document-collection-action.element.ts index 50a05f3eb5..91b87ac52a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/action/create-document-collection-action.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/action/create-document-collection-action.element.ts @@ -10,7 +10,7 @@ import { } from '@umbraco-cms/backoffice/document'; import { UMB_WORKSPACE_MODAL } from '@umbraco-cms/backoffice/modal'; import { UmbModalRouteRegistrationController } from '@umbraco-cms/backoffice/router'; -import type { ManifestCollectionAction } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestCollectionAction } from '@umbraco-cms/backoffice/collection'; import type { UmbAllowedDocumentTypeModel } from '@umbraco-cms/backoffice/document-type'; @customElement('umb-create-document-collection-action') diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/action/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/action/manifests.ts index 23e86e6e81..e50b1ff6d4 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/action/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/action/manifests.ts @@ -1,5 +1,6 @@ import { UMB_COLLECTION_ALIAS_CONDITION } from '@umbraco-cms/backoffice/collection'; -import type { ManifestCollectionAction, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestCollectionAction } from '@umbraco-cms/backoffice/collection'; export const createManifest: ManifestCollectionAction = { type: 'collectionAction', diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/manifests.ts index c1efb302f2..1c00123c54 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/manifests.ts @@ -3,7 +3,9 @@ import { manifests as collectionActionManifests } from './action/manifests.js'; import { manifests as collectionRepositoryManifests } from './repository/manifests.js'; import { manifests as collectionViewManifests } from './views/manifests.js'; import { UMB_DOCUMENT_COLLECTION_ALIAS } from './index.js'; -import type { ManifestCollection, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; + +import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestCollection } from '@umbraco-cms/backoffice/collection'; const collectionManifest: ManifestCollection = { type: 'collection', diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/views/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/views/manifests.ts index 36f872a12f..d716df672e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/views/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/views/manifests.ts @@ -1,45 +1,43 @@ import { UMB_COLLECTION_ALIAS_CONDITION } from '@umbraco-cms/backoffice/collection'; -import type { ManifestCollectionView, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; export const UMB_DOCUMENT_GRID_COLLECTION_VIEW_ALIAS = 'Umb.CollectionView.Document.Grid'; export const UMB_DOCUMENT_TABLE_COLLECTION_VIEW_ALIAS = 'Umb.CollectionView.Document.Table'; -const gridViewManifest: ManifestCollectionView = { - type: 'collectionView', - alias: UMB_DOCUMENT_GRID_COLLECTION_VIEW_ALIAS, - name: 'Document Grid Collection View', - element: () => import('./grid/document-grid-collection-view.element.js'), - weight: 200, - meta: { - label: 'Grid', - icon: 'icon-grid', - pathName: 'grid', - }, - conditions: [ - { - alias: UMB_COLLECTION_ALIAS_CONDITION, - match: 'Umb.Collection.Document', +export const manifests: Array = [ + { + type: 'collectionView', + alias: UMB_DOCUMENT_GRID_COLLECTION_VIEW_ALIAS, + name: 'Document Grid Collection View', + element: () => import('./grid/document-grid-collection-view.element.js'), + weight: 200, + meta: { + label: 'Grid', + icon: 'icon-grid', + pathName: 'grid', }, - ], -}; - -const tableViewManifest: ManifestCollectionView = { - type: 'collectionView', - alias: UMB_DOCUMENT_TABLE_COLLECTION_VIEW_ALIAS, - name: 'Document Table Collection View', - element: () => import('./table/document-table-collection-view.element.js'), - weight: 300, - meta: { - label: 'Table', - icon: 'icon-list', - pathName: 'table', + conditions: [ + { + alias: UMB_COLLECTION_ALIAS_CONDITION, + match: 'Umb.Collection.Document', + }, + ], }, - conditions: [ - { - alias: UMB_COLLECTION_ALIAS_CONDITION, - match: 'Umb.Collection.Document', + { + type: 'collectionView', + alias: UMB_DOCUMENT_TABLE_COLLECTION_VIEW_ALIAS, + name: 'Document Table Collection View', + element: () => import('./table/document-table-collection-view.element.js'), + weight: 300, + meta: { + label: 'Table', + icon: 'icon-list', + pathName: 'table', }, - ], -}; - -export const manifests: Array = [gridViewManifest, tableViewManifest]; + conditions: [ + { + alias: UMB_COLLECTION_ALIAS_CONDITION, + match: 'Umb.Collection.Document', + }, + ], + }, +]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/language/collection/action/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/language/collection/action/manifests.ts index bf76be9c0d..5ec24291b8 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/language/collection/action/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/language/collection/action/manifests.ts @@ -1,5 +1,6 @@ import { UMB_COLLECTION_ALIAS_CONDITION } from '@umbraco-cms/backoffice/collection'; -import type { ManifestCollectionAction, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestCollectionAction } from '@umbraco-cms/backoffice/collection'; export const createManifest: ManifestCollectionAction = { type: 'collectionAction', diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/views/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/views/manifests.ts index dcc1bd579b..0ebc88d9d4 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/views/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/views/manifests.ts @@ -1,6 +1,7 @@ import { UMB_COLLECTION_VIEW_USER_GRID, UMB_COLLECTION_VIEW_USER_TABLE } from './constants.js'; import { UMB_COLLECTION_ALIAS_CONDITION } from '@umbraco-cms/backoffice/collection'; -import type { ManifestCollectionView, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestCollectionView } from '@umbraco-cms/backoffice/collection'; const tableCollectionView: ManifestCollectionView = { type: 'collectionView', diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/collection-action/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/collection-action/manifests.ts index 0411ed0301..dfc9c59004 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/collection-action/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/collection-action/manifests.ts @@ -1,22 +1,21 @@ import { UMB_COLLECTION_ALIAS_CONDITION } from '@umbraco-cms/backoffice/collection'; -import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; -export const inviteManifest: ManifestTypes = { - type: 'collectionAction', - kind: 'button', - name: 'Invite User Collection Action', - alias: 'Umb.CollectionAction.User.Invite', - api: () => import('./invite-user.collection-action.js'), - weight: 100, - meta: { - label: '#user_invite', - }, - conditions: [ - { - alias: UMB_COLLECTION_ALIAS_CONDITION, - match: 'Umb.Collection.User', +export const manifests: Array = [ + { + type: 'collectionAction', + kind: 'button', + name: 'Invite User Collection Action', + alias: 'Umb.CollectionAction.User.Invite', + api: () => import('./invite-user.collection-action.js'), + weight: 100, + meta: { + label: '#user_invite', }, - ], -}; - -export const manifests: Array = [inviteManifest]; + conditions: [ + { + alias: UMB_COLLECTION_ALIAS_CONDITION, + match: 'Umb.Collection.User', + }, + ], + }, +]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/webhook/collection/action/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/webhook/collection/action/manifests.ts index 219c359da4..aa9fa9d080 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/webhook/collection/action/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/webhook/collection/action/manifests.ts @@ -1,5 +1,6 @@ import { UMB_COLLECTION_ALIAS_CONDITION } from '@umbraco-cms/backoffice/collection'; -import type { ManifestCollectionAction, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestCollectionAction } from '@umbraco-cms/backoffice/collection'; export const createManifest: ManifestCollectionAction = { type: 'collectionAction', diff --git a/src/Umbraco.Web.UI.Client/src/packages/webhook/collection/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/webhook/collection/manifests.ts index ca36d3b996..469c205106 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/webhook/collection/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/webhook/collection/manifests.ts @@ -4,7 +4,8 @@ import { } from './repository/manifests.js'; import { manifests as collectionViewManifests } from './views/manifests.js'; import { manifests as collectionActionManifests } from './action/manifests.js'; -import type { ManifestCollection, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestCollection } from '@umbraco-cms/backoffice/collection'; export const UMB_WEBHOOK_COLLECTION_ALIAS = 'Umb.Collection.Webhook'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/webhook/collection/views/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/webhook/collection/views/manifests.ts index d03570c014..d600aaed45 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/webhook/collection/views/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/webhook/collection/views/manifests.ts @@ -1,5 +1,6 @@ import { UMB_COLLECTION_ALIAS_CONDITION } from '@umbraco-cms/backoffice/collection'; -import type { ManifestCollectionView, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestCollectionView } from '@umbraco-cms/backoffice/collection'; export const UMB_WEBHOOK_TABLE_COLLECTION_VIEW_ALIAS = 'Umb.CollectionView.Webhook.Table'; From 5201dd6ca0ca729b0aff2a11979ace16da29d56f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Fri, 13 Sep 2024 13:32:12 +0200 Subject: [PATCH 28/43] global type definition --- .../extension-registry/conditions/types.ts | 38 ++++++++++++++++--- .../models/collection-action.model.ts | 5 ++- .../models/collection-view.model.ts | 3 +- .../models/collection.models.ts | 5 ++- .../models/current-user-action.model.ts | 3 +- .../models/dashboard.model.ts | 3 +- 6 files changed, 42 insertions(+), 15 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/conditions/types.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/conditions/types.ts index 2c4296cae0..72219b0bb7 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/conditions/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/conditions/types.ts @@ -12,11 +12,6 @@ import type { import type { UmbConditionConfigBase } from '@umbraco-cms/backoffice/extension-api'; import type { UmbDocumentUserPermissionConditionConfig } from '@umbraco-cms/backoffice/document'; -/* TODO: in theory should't the core package import from other packages. -Are there any other way we can do this? -Niels: Sadly I don't see any other solutions currently. But are very open for ideas :-) now that I think about it maybe there is some ability to extend a global type, similar to the 'declare global' trick we use on Elements. -*/ - // temp location to avoid circular dependencies export type BlockWorkspaceHasSettingsConditionConfig = UmbConditionConfigBase<'Umb.Condition.BlockWorkspaceHasSettings'>; @@ -38,3 +33,36 @@ export type ConditionTypes = | WorkspaceAliasConditionConfig | WorkspaceContentTypeAliasConditionConfig | WorkspaceEntityTypeConditionConfig; + +type UnionOfProperties = T extends object ? T[keyof T] : never; + +declare global { + /** + * This global type allows to declare condition types from its own module. + * @example + ```js + declare global { + interface UmbExtensionConditionMap { + My_UNIQUE_CONDITION_NAME: MyExtensionConditionType; + } + } + ``` + If you have multiple types, you can declare them in this way: + ```js + declare global { + interface UmbExtensionConditionMap { + My_UNIQUE_CONDITION_NAME: MyExtensionConditionTypeA | MyExtensionConditionTypeB; + } + } + ``` + */ + interface UmbExtensionConditionMap { + UMB_CORE: ConditionTypes; + } + + /** + * This global type provides a union of all declared manifest types. + * If this is a local package that declares additional Manifest Types, then these will also be included in this union. + */ + type UmbExtensionCondition = UnionOfProperties; +} diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/collection-action.model.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/collection-action.model.ts index af178c67bd..edc76284d8 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/collection-action.model.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/collection-action.model.ts @@ -1,4 +1,3 @@ -import type { ConditionTypes } from '../conditions/types.js'; import type { ManifestElementAndApi, ManifestWithDynamicConditions } from '@umbraco-cms/backoffice/extension-api'; /** @@ -6,7 +5,9 @@ import type { ManifestElementAndApi, ManifestWithDynamicConditions } from '@umbr * For example for content you may wish to create a new document etc */ // TODO: create interface for API -export interface ManifestCollectionAction extends ManifestElementAndApi, ManifestWithDynamicConditions { +export interface ManifestCollectionAction + extends ManifestElementAndApi, + ManifestWithDynamicConditions { type: 'collectionAction'; meta: MetaCollectionAction; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/collection-view.model.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/collection-view.model.ts index 5f1e3d3ba3..6298377e55 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/collection-view.model.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/collection-view.model.ts @@ -1,7 +1,6 @@ -import type { ConditionTypes } from '../conditions/types.js'; import type { ManifestElement, ManifestWithDynamicConditions } from '@umbraco-cms/backoffice/extension-api'; -export interface ManifestCollectionView extends ManifestElement, ManifestWithDynamicConditions { +export interface ManifestCollectionView extends ManifestElement, ManifestWithDynamicConditions { type: 'collectionView'; meta: MetaCollectionView; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/collection.models.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/collection.models.ts index c3a5b4e16b..d5e2bc4cec 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/collection.models.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/collection.models.ts @@ -1,7 +1,8 @@ -import type { ConditionTypes } from '../conditions/types.js'; import type { ManifestElementAndApi, ManifestWithDynamicConditions } from '@umbraco-cms/backoffice/extension-api'; -export interface ManifestCollection extends ManifestElementAndApi, ManifestWithDynamicConditions { +export interface ManifestCollection + extends ManifestElementAndApi, + ManifestWithDynamicConditions { type: 'collection'; meta: MetaCollection; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/current-user-action.model.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/current-user-action.model.ts index 5366cb251e..90ad56e9dd 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/current-user-action.model.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/current-user-action.model.ts @@ -1,4 +1,3 @@ -import type { ConditionTypes } from '../conditions/types.js'; import type { UmbAction } from '../../action/action.interface.js'; import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api'; import type { ManifestElementAndApi, ManifestWithDynamicConditions } from '@umbraco-cms/backoffice/extension-api'; @@ -24,7 +23,7 @@ export interface UmbCurrentUserAction extends UmbAction extends ManifestElementAndApi>, - ManifestWithDynamicConditions { + ManifestWithDynamicConditions { type: 'currentUserAction'; meta: MetaType; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/dashboard.model.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/dashboard.model.ts index 95d78dcafb..c800737f0c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/dashboard.model.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/dashboard.model.ts @@ -1,10 +1,9 @@ -import type { ConditionTypes } from '../conditions/types.js'; import type { UmbDashboardElement } from '../interfaces/index.js'; import type { ManifestElement, ManifestWithDynamicConditions } from '@umbraco-cms/backoffice/extension-api'; export interface ManifestDashboard extends ManifestElement, - ManifestWithDynamicConditions { + ManifestWithDynamicConditions { type: 'dashboard'; meta: MetaDashboard; } From e618351f3fec87dbba14d3831d558605b54d53c7 Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Fri, 13 Sep 2024 14:01:43 +0200 Subject: [PATCH 29/43] update lockfile --- src/Umbraco.Web.UI.Client/package-lock.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json index 8792c5f0ca..4acffeedbd 100644 --- a/src/Umbraco.Web.UI.Client/package-lock.json +++ b/src/Umbraco.Web.UI.Client/package-lock.json @@ -23082,7 +23082,9 @@ "src/packages/health-check": { "name": "@umbraco-backoffice/health-check" }, - "src/packages/help": {}, + "src/packages/help": { + "name": "@umbraco-backoffice/help" + }, "src/packages/language": { "name": "@umbraco-backoffice/language" }, From eb3d6437c8b778ae5c0f73ece0be91df8e1c5089 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Fri, 13 Sep 2024 14:03:57 +0200 Subject: [PATCH 30/43] use global type --- .../core/extension-registry/models/entity-action.model.ts | 3 +-- .../extension-registry/models/entity-bulk-action.model.ts | 3 +-- .../core/extension-registry/models/menu-item.model.ts | 3 +-- .../core/extension-registry/models/property-action.model.ts | 3 +-- .../core/extension-registry/models/repository.model.ts | 3 +-- .../extension-registry/models/section-sidebar-app.model.ts | 3 +-- .../core/extension-registry/models/section-view.model.ts | 3 +-- .../packages/core/extension-registry/models/section.model.ts | 3 +-- .../packages/core/extension-registry/models/tree.model.ts | 3 +-- .../models/workspace-action-menu-item.model.ts | 3 +-- .../core/extension-registry/models/workspace-action.model.ts | 3 +-- .../extension-registry/models/workspace-context.model.ts | 5 +++-- .../extension-registry/models/workspace-footer-app.model.ts | 3 +-- .../core/extension-registry/models/workspace-view.model.ts | 3 +-- 14 files changed, 16 insertions(+), 28 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/entity-action.model.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/entity-action.model.ts index 7a5c58c46a..2108a6b1fc 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/entity-action.model.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/entity-action.model.ts @@ -1,4 +1,3 @@ -import type { ConditionTypes } from '../conditions/types.js'; import type { ManifestElementAndApi, ManifestWithDynamicConditions } from '@umbraco-cms/backoffice/extension-api'; import type { UmbEntityAction, UmbEntityActionElement } from '@umbraco-cms/backoffice/entity-action'; import type { UmbModalToken, UmbPickerModalData, UmbPickerModalValue } from '@umbraco-cms/backoffice/modal'; @@ -9,7 +8,7 @@ import type { UmbModalToken, UmbPickerModalData, UmbPickerModalValue } from '@um */ export interface ManifestEntityAction extends ManifestElementAndApi>, - ManifestWithDynamicConditions { + ManifestWithDynamicConditions { type: 'entityAction'; forEntityTypes: Array; meta: MetaType; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/entity-bulk-action.model.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/entity-bulk-action.model.ts index ee70697aaf..b3244c18ed 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/entity-bulk-action.model.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/entity-bulk-action.model.ts @@ -1,4 +1,3 @@ -import type { ConditionTypes } from '../conditions/types.js'; import type { UmbEntityBulkActionElement } from '../../entity-bulk-action/entity-bulk-action-element.interface.js'; import type { UmbEntityBulkAction } from '@umbraco-cms/backoffice/entity-bulk-action'; import type { ManifestElementAndApi, ManifestWithDynamicConditions } from '@umbraco-cms/backoffice/extension-api'; @@ -9,7 +8,7 @@ import type { ManifestElementAndApi, ManifestWithDynamicConditions } from '@umbr */ export interface ManifestEntityBulkAction extends ManifestElementAndApi>, - ManifestWithDynamicConditions { + ManifestWithDynamicConditions { type: 'entityBulkAction'; forEntityTypes: Array; meta: MetaType; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/menu-item.model.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/menu-item.model.ts index 68f7d2f354..eb5893aaba 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/menu-item.model.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/menu-item.model.ts @@ -1,10 +1,9 @@ import type { UmbMenuItemElement } from '../interfaces/menu-item-element.interface.js'; -import type { ConditionTypes } from '../conditions/types.js'; import type { ManifestWithDynamicConditions, ManifestElement } from '@umbraco-cms/backoffice/extension-api'; export interface ManifestMenuItem extends ManifestElement, - ManifestWithDynamicConditions { + ManifestWithDynamicConditions { type: 'menuItem'; meta: MetaMenuItem; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/property-action.model.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/property-action.model.ts index 563ca1894c..b166089768 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/property-action.model.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/property-action.model.ts @@ -1,11 +1,10 @@ -import type { ConditionTypes } from '../conditions/types.js'; import type { UmbPropertyAction } from '../../property-action/components/property-action/property-action.interface.js'; import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api'; import type { ManifestElementAndApi, ManifestWithDynamicConditions } from '@umbraco-cms/backoffice/extension-api'; export interface ManifestPropertyAction extends ManifestElementAndApi>, - ManifestWithDynamicConditions { + ManifestWithDynamicConditions { type: 'propertyAction'; forPropertyEditorUis: string[]; meta: MetaType; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/repository.model.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/repository.model.ts index 3a169b1d9a..ac865f4488 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/repository.model.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/repository.model.ts @@ -1,8 +1,7 @@ -import type { ConditionTypes } from '../conditions/types.js'; import type { UmbApi, ManifestApi, ManifestWithDynamicConditions } from '@umbraco-cms/backoffice/extension-api'; // TODO: Consider adding a ClassType for this manifest. (Currently we cannot know the scope of a repository, therefor we are going with ExtensionApi for now.) export interface ManifestRepository extends ManifestApi, - ManifestWithDynamicConditions { + ManifestWithDynamicConditions { type: 'repository'; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/section-sidebar-app.model.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/section-sidebar-app.model.ts index 2a0abb3bc7..6325b00182 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/section-sidebar-app.model.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/section-sidebar-app.model.ts @@ -1,10 +1,9 @@ -import type { ConditionTypes } from '../conditions/types.js'; import type { UmbSectionSidebarAppElement } from '../interfaces/section-sidebar-app-element.interface.js'; import type { ManifestElement, ManifestWithDynamicConditions } from '@umbraco-cms/backoffice/extension-api'; export interface ManifestSectionSidebarApp extends ManifestElement, - ManifestWithDynamicConditions { + ManifestWithDynamicConditions { type: 'sectionSidebarApp'; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/section-view.model.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/section-view.model.ts index 426dd4eaae..f650d7c922 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/section-view.model.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/section-view.model.ts @@ -1,10 +1,9 @@ -import type { ConditionTypes } from '../conditions/types.js'; import type { UmbSectionViewElement } from '../interfaces/section-view-element.interface.js'; import type { ManifestElement, ManifestWithDynamicConditions } from '@umbraco-cms/backoffice/extension-api'; export interface ManifestSectionView extends ManifestElement, - ManifestWithDynamicConditions { + ManifestWithDynamicConditions { type: 'sectionView'; meta: MetaSectionView; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/section.model.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/section.model.ts index 95b6661c05..226cc8b9f3 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/section.model.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/section.model.ts @@ -1,10 +1,9 @@ -import type { ConditionTypes } from '../conditions/types.js'; import type { UmbSectionElement } from '../interfaces/index.js'; import type { ManifestElement, ManifestWithDynamicConditions } from '@umbraco-cms/backoffice/extension-api'; export interface ManifestSection extends ManifestElement, - ManifestWithDynamicConditions { + ManifestWithDynamicConditions { type: 'section'; meta: MetaSection; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/tree.model.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/tree.model.ts index fce6b56f7a..061eaeabb6 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/tree.model.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/tree.model.ts @@ -1,7 +1,6 @@ -import type { ConditionTypes } from '../conditions/types.js'; import type { ManifestElementAndApi, ManifestWithDynamicConditions } from '@umbraco-cms/backoffice/extension-api'; -export interface ManifestTree extends ManifestElementAndApi, ManifestWithDynamicConditions { +export interface ManifestTree extends ManifestElementAndApi, ManifestWithDynamicConditions { type: 'tree'; meta: MetaTree; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/workspace-action-menu-item.model.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/workspace-action-menu-item.model.ts index 8c09805c6d..c5eb61f729 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/workspace-action-menu-item.model.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/workspace-action-menu-item.model.ts @@ -1,4 +1,3 @@ -import type { ConditionTypes } from '../conditions/types.js'; import type { UmbWorkspaceActionMenuItem } from '../../workspace/components/workspace-action-menu-item/workspace-action-menu-item.interface.js'; import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api'; import type { ManifestElementAndApi, ManifestWithDynamicConditions } from '@umbraco-cms/backoffice/extension-api'; @@ -6,7 +5,7 @@ import type { ManifestElementAndApi, ManifestWithDynamicConditions } from '@umbr export interface ManifestWorkspaceActionMenuItem< MetaType extends MetaWorkspaceActionMenuItem = MetaWorkspaceActionMenuItem, > extends ManifestElementAndApi>, - ManifestWithDynamicConditions { + ManifestWithDynamicConditions { type: 'workspaceActionMenuItem'; /** * Define which workspace actions this menu item should be shown for. diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/workspace-action.model.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/workspace-action.model.ts index ee83060735..815f5a8916 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/workspace-action.model.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/workspace-action.model.ts @@ -1,4 +1,3 @@ -import type { ConditionTypes } from '../conditions/types.js'; import type { UUIInterfaceColor, UUIInterfaceLook } from '@umbraco-cms/backoffice/external/uui'; import type { ManifestElementAndApi, ManifestWithDynamicConditions } from '@umbraco-cms/backoffice/extension-api'; import type { UmbWorkspaceAction } from '@umbraco-cms/backoffice/workspace'; @@ -6,7 +5,7 @@ import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controlle export interface ManifestWorkspaceAction extends ManifestElementAndApi>, - ManifestWithDynamicConditions { + ManifestWithDynamicConditions { type: 'workspaceAction'; meta: MetaType; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/workspace-context.model.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/workspace-context.model.ts index 98181a6f38..d35c05d967 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/workspace-context.model.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/workspace-context.model.ts @@ -1,6 +1,7 @@ -import type { ConditionTypes } from '../conditions/types.js'; import type { ManifestApi, ManifestWithDynamicConditions, UmbApi } from '@umbraco-cms/backoffice/extension-api'; -export interface ManifestWorkspaceContext extends ManifestWithDynamicConditions, ManifestApi { +export interface ManifestWorkspaceContext + extends ManifestWithDynamicConditions, + ManifestApi { type: 'workspaceContext'; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/workspace-footer-app.model.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/workspace-footer-app.model.ts index b1d3972895..8de8e2a736 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/workspace-footer-app.model.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/workspace-footer-app.model.ts @@ -1,10 +1,9 @@ -import type { ConditionTypes } from '../conditions/types.js'; import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api'; import type { ManifestElementAndApi, ManifestWithDynamicConditions } from '@umbraco-cms/backoffice/extension-api'; export interface ManifestWorkspaceFooterApp extends ManifestElementAndApi, - ManifestWithDynamicConditions { + ManifestWithDynamicConditions { type: 'workspaceFooterApp'; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/workspace-view.model.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/workspace-view.model.ts index a8e3af27ac..fc6e49012a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/workspace-view.model.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/workspace-view.model.ts @@ -1,4 +1,3 @@ -import type { ConditionTypes } from '../conditions/types.js'; import type { UmbWorkspaceViewElement } from '../interfaces/workspace-view-element.interface.js'; import type { ManifestWithDynamicConditions, @@ -8,7 +7,7 @@ import type { export interface ManifestWorkspaceView extends ManifestWithView, - ManifestWithDynamicConditions { + ManifestWithDynamicConditions { type: 'workspaceView'; meta: MetaType; } From c924bd950cf008c6755a363cd8c1ac08c39167ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Fri, 13 Sep 2024 14:05:55 +0200 Subject: [PATCH 31/43] use UmbExtensionCondition --- .../core/extension-registry/models/entity-action.model.ts | 2 +- .../core/extension-registry/models/entity-bulk-action.model.ts | 2 +- .../packages/core/extension-registry/models/menu-item.model.ts | 2 +- .../core/extension-registry/models/property-action.model.ts | 2 +- .../packages/core/extension-registry/models/repository.model.ts | 2 +- .../core/extension-registry/models/section-sidebar-app.model.ts | 2 +- .../core/extension-registry/models/section-view.model.ts | 2 +- .../packages/core/extension-registry/models/section.model.ts | 2 +- .../src/packages/core/extension-registry/models/tree.model.ts | 2 +- .../models/workspace-action-menu-item.model.ts | 2 +- .../core/extension-registry/models/workspace-action.model.ts | 2 +- .../core/extension-registry/models/workspace-context.model.ts | 2 +- .../extension-registry/models/workspace-footer-app.model.ts | 2 +- .../core/extension-registry/models/workspace-view.model.ts | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/entity-action.model.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/entity-action.model.ts index 2108a6b1fc..5baafff43d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/entity-action.model.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/entity-action.model.ts @@ -8,7 +8,7 @@ import type { UmbModalToken, UmbPickerModalData, UmbPickerModalValue } from '@um */ export interface ManifestEntityAction extends ManifestElementAndApi>, - ManifestWithDynamicConditions { + ManifestWithDynamicConditions { type: 'entityAction'; forEntityTypes: Array; meta: MetaType; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/entity-bulk-action.model.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/entity-bulk-action.model.ts index b3244c18ed..302710ac14 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/entity-bulk-action.model.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/entity-bulk-action.model.ts @@ -8,7 +8,7 @@ import type { ManifestElementAndApi, ManifestWithDynamicConditions } from '@umbr */ export interface ManifestEntityBulkAction extends ManifestElementAndApi>, - ManifestWithDynamicConditions { + ManifestWithDynamicConditions { type: 'entityBulkAction'; forEntityTypes: Array; meta: MetaType; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/menu-item.model.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/menu-item.model.ts index eb5893aaba..c0e8cbf63a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/menu-item.model.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/menu-item.model.ts @@ -3,7 +3,7 @@ import type { ManifestWithDynamicConditions, ManifestElement } from '@umbraco-cm export interface ManifestMenuItem extends ManifestElement, - ManifestWithDynamicConditions { + ManifestWithDynamicConditions { type: 'menuItem'; meta: MetaMenuItem; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/property-action.model.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/property-action.model.ts index b166089768..f5ca9ab23c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/property-action.model.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/property-action.model.ts @@ -4,7 +4,7 @@ import type { ManifestElementAndApi, ManifestWithDynamicConditions } from '@umbr export interface ManifestPropertyAction extends ManifestElementAndApi>, - ManifestWithDynamicConditions { + ManifestWithDynamicConditions { type: 'propertyAction'; forPropertyEditorUis: string[]; meta: MetaType; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/repository.model.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/repository.model.ts index ac865f4488..0008dd88a0 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/repository.model.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/repository.model.ts @@ -2,6 +2,6 @@ import type { UmbApi, ManifestApi, ManifestWithDynamicConditions } from '@umbrac // TODO: Consider adding a ClassType for this manifest. (Currently we cannot know the scope of a repository, therefor we are going with ExtensionApi for now.) export interface ManifestRepository extends ManifestApi, - ManifestWithDynamicConditions { + ManifestWithDynamicConditions { type: 'repository'; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/section-sidebar-app.model.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/section-sidebar-app.model.ts index 6325b00182..8bf18b69c2 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/section-sidebar-app.model.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/section-sidebar-app.model.ts @@ -3,7 +3,7 @@ import type { ManifestElement, ManifestWithDynamicConditions } from '@umbraco-cm export interface ManifestSectionSidebarApp extends ManifestElement, - ManifestWithDynamicConditions { + ManifestWithDynamicConditions { type: 'sectionSidebarApp'; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/section-view.model.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/section-view.model.ts index f650d7c922..8001e645cf 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/section-view.model.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/section-view.model.ts @@ -3,7 +3,7 @@ import type { ManifestElement, ManifestWithDynamicConditions } from '@umbraco-cm export interface ManifestSectionView extends ManifestElement, - ManifestWithDynamicConditions { + ManifestWithDynamicConditions { type: 'sectionView'; meta: MetaSectionView; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/section.model.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/section.model.ts index 226cc8b9f3..8e615a895b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/section.model.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/section.model.ts @@ -3,7 +3,7 @@ import type { ManifestElement, ManifestWithDynamicConditions } from '@umbraco-cm export interface ManifestSection extends ManifestElement, - ManifestWithDynamicConditions { + ManifestWithDynamicConditions { type: 'section'; meta: MetaSection; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/tree.model.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/tree.model.ts index 061eaeabb6..848ad65021 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/tree.model.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/tree.model.ts @@ -1,6 +1,6 @@ import type { ManifestElementAndApi, ManifestWithDynamicConditions } from '@umbraco-cms/backoffice/extension-api'; -export interface ManifestTree extends ManifestElementAndApi, ManifestWithDynamicConditions { +export interface ManifestTree extends ManifestElementAndApi, ManifestWithDynamicConditions { type: 'tree'; meta: MetaTree; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/workspace-action-menu-item.model.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/workspace-action-menu-item.model.ts index c5eb61f729..c82d42b19f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/workspace-action-menu-item.model.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/workspace-action-menu-item.model.ts @@ -5,7 +5,7 @@ import type { ManifestElementAndApi, ManifestWithDynamicConditions } from '@umbr export interface ManifestWorkspaceActionMenuItem< MetaType extends MetaWorkspaceActionMenuItem = MetaWorkspaceActionMenuItem, > extends ManifestElementAndApi>, - ManifestWithDynamicConditions { + ManifestWithDynamicConditions { type: 'workspaceActionMenuItem'; /** * Define which workspace actions this menu item should be shown for. diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/workspace-action.model.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/workspace-action.model.ts index 815f5a8916..78c988d443 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/workspace-action.model.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/workspace-action.model.ts @@ -5,7 +5,7 @@ import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controlle export interface ManifestWorkspaceAction extends ManifestElementAndApi>, - ManifestWithDynamicConditions { + ManifestWithDynamicConditions { type: 'workspaceAction'; meta: MetaType; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/workspace-context.model.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/workspace-context.model.ts index d35c05d967..0824891b54 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/workspace-context.model.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/workspace-context.model.ts @@ -1,7 +1,7 @@ import type { ManifestApi, ManifestWithDynamicConditions, UmbApi } from '@umbraco-cms/backoffice/extension-api'; export interface ManifestWorkspaceContext - extends ManifestWithDynamicConditions, + extends ManifestWithDynamicConditions, ManifestApi { type: 'workspaceContext'; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/workspace-footer-app.model.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/workspace-footer-app.model.ts index 8de8e2a736..70bbcd4eb4 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/workspace-footer-app.model.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/workspace-footer-app.model.ts @@ -3,7 +3,7 @@ import type { ManifestElementAndApi, ManifestWithDynamicConditions } from '@umbr export interface ManifestWorkspaceFooterApp extends ManifestElementAndApi, - ManifestWithDynamicConditions { + ManifestWithDynamicConditions { type: 'workspaceFooterApp'; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/workspace-view.model.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/workspace-view.model.ts index fc6e49012a..5fa18028e0 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/workspace-view.model.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/workspace-view.model.ts @@ -7,7 +7,7 @@ import type { export interface ManifestWorkspaceView extends ManifestWithView, - ManifestWithDynamicConditions { + ManifestWithDynamicConditions { type: 'workspaceView'; meta: MetaType; } From a8a53637b652c01d994f7c634f8c9f4ec26627d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Fri, 13 Sep 2024 14:08:08 +0200 Subject: [PATCH 32/43] Block Conditions --- .../src/packages/block/block/conditions/types.ts | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 src/Umbraco.Web.UI.Client/src/packages/block/block/conditions/types.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block/conditions/types.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/conditions/types.ts new file mode 100644 index 0000000000..b7d4e6f2ae --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block/conditions/types.ts @@ -0,0 +1,13 @@ +import type { UmbConditionConfigBase } from '@umbraco-cms/backoffice/extension-api'; + +export type BlockWorkspaceHasSettingsConditionConfig = + UmbConditionConfigBase<'Umb.Condition.BlockWorkspaceHasSettings'>; + +export type BlockEntryShowContentEditConditionConfig = + UmbConditionConfigBase<'Umb.Condition.BlockEntryShowContentEdit'>; + +declare global { + interface UmbExtensionConditionMap { + UmbBlock: BlockEntryShowContentEditConditionConfig | BlockWorkspaceHasSettingsConditionConfig; + } +} From 28548b8e0e6ddcbd6b34208d6189f89db055e5dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Fri, 13 Sep 2024 14:14:20 +0200 Subject: [PATCH 33/43] workspace conditions --- .../extension-registry/conditions/types.ts | 10 +--- .../core/workspace/conditions/const.ts | 1 + .../core/workspace/conditions/index.ts | 6 +-- .../core/workspace/conditions/types.ts | 46 +++++++++++++++++++ .../conditions/workspace-alias.condition.ts | 17 +------ .../workspace-content-type-alias.condition.ts | 18 +------- .../workspace-entity-type.condition.ts | 11 +---- .../workspace-has-collection.condition.ts | 13 ++---- 8 files changed, 57 insertions(+), 65 deletions(-) create mode 100644 src/Umbraco.Web.UI.Client/src/packages/core/workspace/conditions/const.ts create mode 100644 src/Umbraco.Web.UI.Client/src/packages/core/workspace/conditions/types.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/conditions/types.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/conditions/types.ts index 72219b0bb7..0939e4845c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/conditions/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/conditions/types.ts @@ -4,11 +4,6 @@ import type { UmbSectionUserPermissionConditionConfig } from '../../section/cond import type { SectionAliasConditionConfig } from './section-alias.condition.js'; import type { SwitchConditionConfig } from './switch.condition.js'; import type { UmbMultipleAppLanguageConditionConfig } from './multiple-app-languages.condition.js'; -import type { - WorkspaceAliasConditionConfig, - WorkspaceEntityTypeConditionConfig, - WorkspaceContentTypeAliasConditionConfig, -} from '@umbraco-cms/backoffice/workspace'; import type { UmbConditionConfigBase } from '@umbraco-cms/backoffice/extension-api'; import type { UmbDocumentUserPermissionConditionConfig } from '@umbraco-cms/backoffice/document'; @@ -29,10 +24,7 @@ export type ConditionTypes = | UmbConditionConfigBase | UmbDocumentUserPermissionConditionConfig | UmbMultipleAppLanguageConditionConfig - | UmbSectionUserPermissionConditionConfig - | WorkspaceAliasConditionConfig - | WorkspaceContentTypeAliasConditionConfig - | WorkspaceEntityTypeConditionConfig; + | UmbSectionUserPermissionConditionConfig; type UnionOfProperties = T extends object ? T[keyof T] : never; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/conditions/const.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/conditions/const.ts new file mode 100644 index 0000000000..aa7f5b839f --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/conditions/const.ts @@ -0,0 +1 @@ +export const UMB_WORKSPACE_HAS_COLLECTION_CONDITION = 'Umb.Condition.WorkspaceHasCollection'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/conditions/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/conditions/index.ts index 9ec898b193..06c33f562f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/conditions/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/conditions/index.ts @@ -1,5 +1 @@ -export type { WorkspaceAliasConditionConfig } from './workspace-alias.condition.js'; -export type { WorkspaceEntityTypeConditionConfig } from './workspace-entity-type.condition.js'; -export type { WorkspaceHasCollectionConditionConfig } from './workspace-has-collection.condition.js'; -export type { WorkspaceContentTypeAliasConditionConfig as WorkspaceEntityContentTypeConditionConfig } from './workspace-content-type-alias.condition.js'; -export type { WorkspaceContentTypeAliasConditionConfig } from './workspace-content-type-alias.condition.js'; +export type * from './types.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/conditions/types.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/conditions/types.ts new file mode 100644 index 0000000000..dc934238f1 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/conditions/types.ts @@ -0,0 +1,46 @@ +import type { UMB_WORKSPACE_HAS_COLLECTION_CONDITION } from './const.js'; +import type { UmbConditionConfigBase } from '@umbraco-cms/backoffice/extension-api'; + +export type WorkspaceAliasConditionConfig = UmbConditionConfigBase<'Umb.Condition.WorkspaceAlias'> & { + /** + * Define the workspace that this extension should be available in + * @example + * "Umb.Workspace.Document" + */ + match?: string; + /** + * Define one or more workspaces that this extension should be available in + * @example + * ["Umb.Workspace.Document", "Umb.Workspace.Media"] + */ + oneOf?: Array; +}; + +export type WorkspaceContentTypeAliasConditionConfig = + UmbConditionConfigBase<'Umb.Condition.WorkspaceContentTypeAlias'> & { + /** + * Define a content type alias in which workspace this extension should be available + * @example + * Depends on implementation, but i.e. "article", "image", "blockPage" + */ + match?: string; + /** + * Define one or more content type aliases in which workspace this extension should be available + * @example + * ["article", "image", "blockPage"] + */ + oneOf?: Array; + }; + +export type WorkspaceEntityTypeConditionConfig = UmbConditionConfigBase<'Umb.Condition.WorkspaceEntityType'> & { + /** + * Define the workspace that this extension should be available in + * @example + * "Document" + */ + match: string; +}; + +export type WorkspaceHasCollectionConditionConfig = UmbConditionConfigBase< + typeof UMB_WORKSPACE_HAS_COLLECTION_CONDITION +>; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/conditions/workspace-alias.condition.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/conditions/workspace-alias.condition.ts index cd9026d329..e065f2d7a6 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/conditions/workspace-alias.condition.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/conditions/workspace-alias.condition.ts @@ -1,8 +1,8 @@ import { UMB_WORKSPACE_CONTEXT, type UmbWorkspaceContext } from '../contexts/index.js'; +import type { WorkspaceAliasConditionConfig } from './types.js'; import { UmbConditionBase } from '@umbraco-cms/backoffice/extension-registry'; import type { ManifestCondition, - UmbConditionConfigBase, UmbConditionControllerArguments, UmbExtensionCondition, } from '@umbraco-cms/backoffice/extension-api'; @@ -34,21 +34,6 @@ export class UmbWorkspaceAliasCondition } } -export type WorkspaceAliasConditionConfig = UmbConditionConfigBase<'Umb.Condition.WorkspaceAlias'> & { - /** - * Define the workspace that this extension should be available in - * @example - * "Umb.Workspace.Document" - */ - match?: string; - /** - * Define one or more workspaces that this extension should be available in - * @example - * ["Umb.Workspace.Document", "Umb.Workspace.Media"] - */ - oneOf?: Array; -}; - export const manifest: ManifestCondition = { type: 'condition', name: 'Workspace Alias Condition', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/conditions/workspace-content-type-alias.condition.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/conditions/workspace-content-type-alias.condition.ts index eefd16baa0..c6bb6b8a4d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/conditions/workspace-content-type-alias.condition.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/conditions/workspace-content-type-alias.condition.ts @@ -1,9 +1,9 @@ import { UmbConditionBase } from '../../extension-registry/conditions/condition-base.controller.js'; +import type { WorkspaceContentTypeAliasConditionConfig } from './types.js'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { UMB_PROPERTY_STRUCTURE_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/workspace'; import type { ManifestCondition, - UmbConditionConfigBase, UmbConditionControllerArguments, UmbExtensionCondition, } from '@umbraco-cms/backoffice/extension-api'; @@ -49,22 +49,6 @@ export class UmbWorkspaceContentTypeAliasCondition } } -export type WorkspaceContentTypeAliasConditionConfig = - UmbConditionConfigBase<'Umb.Condition.WorkspaceContentTypeAlias'> & { - /** - * Define a content type alias in which workspace this extension should be available - * @example - * Depends on implementation, but i.e. "article", "image", "blockPage" - */ - match?: string; - /** - * Define one or more content type aliases in which workspace this extension should be available - * @example - * ["article", "image", "blockPage"] - */ - oneOf?: Array; - }; - export const manifest: ManifestCondition = { type: 'condition', name: 'Workspace Content Type Alias Condition', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/conditions/workspace-entity-type.condition.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/conditions/workspace-entity-type.condition.ts index b8b510681f..45e61e61f6 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/conditions/workspace-entity-type.condition.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/conditions/workspace-entity-type.condition.ts @@ -1,8 +1,8 @@ import { UMB_WORKSPACE_CONTEXT } from '../contexts/index.js'; +import type { WorkspaceEntityTypeConditionConfig } from './types.js'; import { UmbConditionBase } from '@umbraco-cms/backoffice/extension-registry'; import type { ManifestCondition, - UmbConditionConfigBase, UmbConditionControllerArguments, UmbExtensionCondition, } from '@umbraco-cms/backoffice/extension-api'; @@ -20,15 +20,6 @@ export class UmbWorkspaceEntityTypeCondition } } -export type WorkspaceEntityTypeConditionConfig = UmbConditionConfigBase<'Umb.Condition.WorkspaceEntityType'> & { - /** - * Define the workspace that this extension should be available in - * @example - * "Document" - */ - match: string; -}; - export const manifest: ManifestCondition = { type: 'condition', name: 'Workspace Entity Type Condition', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/conditions/workspace-has-collection.condition.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/conditions/workspace-has-collection.condition.ts index ef1ef8c203..1ce9048884 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/conditions/workspace-has-collection.condition.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/conditions/workspace-has-collection.condition.ts @@ -1,13 +1,16 @@ import { UMB_COLLECTION_WORKSPACE_CONTEXT } from '../contexts/tokens/collection-workspace.context-token.js'; +import type { WorkspaceHasCollectionConditionConfig } from './types.js'; +import { UMB_WORKSPACE_HAS_COLLECTION_CONDITION } from './const.js'; import { UmbConditionBase } from '@umbraco-cms/backoffice/extension-registry'; import type { ManifestCondition, - UmbConditionConfigBase, UmbConditionControllerArguments, UmbExtensionCondition, } from '@umbraco-cms/backoffice/extension-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; +const ObserveSymbol = Symbol(); + export class UmbWorkspaceHasCollectionCondition extends UmbConditionBase implements UmbExtensionCondition @@ -21,18 +24,12 @@ export class UmbWorkspaceHasCollectionCondition (hasCollection) => { this.permitted = hasCollection; }, - 'observeHasCollection', + ObserveSymbol, ); }); } } -export type WorkspaceHasCollectionConditionConfig = UmbConditionConfigBase< - typeof UMB_WORKSPACE_HAS_COLLECTION_CONDITION ->; - -export const UMB_WORKSPACE_HAS_COLLECTION_CONDITION = 'Umb.Condition.WorkspaceHasCollection'; - export const manifest: ManifestCondition = { type: 'condition', name: 'Workspace Has Collection Condition', From ba6178b738896d66bff90800cde85ca576b06d6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Fri, 13 Sep 2024 14:16:54 +0200 Subject: [PATCH 34/43] expose workspace conditions --- .../src/packages/core/workspace/conditions/types.ts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/conditions/types.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/conditions/types.ts index dc934238f1..9f4d0fc1b0 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/conditions/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/conditions/types.ts @@ -44,3 +44,12 @@ export type WorkspaceEntityTypeConditionConfig = UmbConditionConfigBase<'Umb.Con export type WorkspaceHasCollectionConditionConfig = UmbConditionConfigBase< typeof UMB_WORKSPACE_HAS_COLLECTION_CONDITION >; + +declare global { + interface UmbExtensionConditionMap { + UmbWorkspaceAlias: WorkspaceAliasConditionConfig; + UmbWorkspaceContentTypeAlias: WorkspaceContentTypeAliasConditionConfig; + UmbWorkspaceEntityType: WorkspaceEntityTypeConditionConfig; + UmbWorkspaceHasCollection: WorkspaceHasCollectionConditionConfig; + } +} From c30151a18404d36e27ad248f4038f56da30d86c6 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Fri, 13 Sep 2024 14:18:32 +0200 Subject: [PATCH 35/43] update imports --- .../packages/language/collection/manifests.ts | 27 ++++++------ .../language/collection/views/manifests.ts | 37 ++++++++--------- .../create-media-collection-action.element.ts | 2 +- .../media/collection/action/manifests.ts | 37 ++++++++--------- .../media/media/collection/manifests.ts | 23 +++++------ .../media/media/collection/views/manifests.ts | 3 +- .../collection/action/manifests.ts | 37 ++++++++--------- .../member-group/collection/manifests.ts | 21 ++++------ .../collection/views/manifests.ts | 37 ++++++++--------- .../member/collection/action/manifests.ts | 41 +++++++++---------- .../members/member/collection/manifests.ts | 23 +++++------ .../member/collection/views/manifests.ts | 37 ++++++++--------- .../relation-types/collection/manifests.ts | 23 +++++------ .../collection/views/manifests.ts | 37 ++++++++--------- .../user-group/collection/action/manifests.ts | 37 ++++++++--------- .../user/user-group/collection/manifests.ts | 23 +++++------ .../user-group/collection/views/manifests.ts | 37 ++++++++--------- .../user/user/collection/action/manifests.ts | 31 +++++++------- .../user/user/collection/manifests.ts | 23 +++++------ 19 files changed, 253 insertions(+), 283 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/language/collection/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/language/collection/manifests.ts index d03f3a5bb6..6b441f4013 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/language/collection/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/language/collection/manifests.ts @@ -1,23 +1,20 @@ -import { UMB_LANGUAGE_COLLECTION_REPOSITORY_ALIAS } from './repository/index.js'; +import { manifests as collectionActionManifests } from './action/manifests.js'; import { manifests as collectionRepositoryManifests } from './repository/manifests.js'; import { manifests as collectionViewManifests } from './views/manifests.js'; -import { manifests as collectionActionManifests } from './action/manifests.js'; import { UMB_LANGUAGE_COLLECTION_ALIAS } from './constants.js'; -import type { ManifestCollection, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; +import { UMB_LANGUAGE_COLLECTION_REPOSITORY_ALIAS } from './repository/index.js'; -const collectionManifest: ManifestCollection = { - type: 'collection', - kind: 'default', - alias: UMB_LANGUAGE_COLLECTION_ALIAS, - name: 'Language Collection', - meta: { - repositoryAlias: UMB_LANGUAGE_COLLECTION_REPOSITORY_ALIAS, +export const manifests: Array = [ + { + type: 'collection', + kind: 'default', + alias: UMB_LANGUAGE_COLLECTION_ALIAS, + name: 'Language Collection', + meta: { + repositoryAlias: UMB_LANGUAGE_COLLECTION_REPOSITORY_ALIAS, + }, }, -}; - -export const manifests: Array = [ - collectionManifest, + ...collectionActionManifests, ...collectionRepositoryManifests, ...collectionViewManifests, - ...collectionActionManifests, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/language/collection/views/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/language/collection/views/manifests.ts index 81b06449a8..ec6bf07875 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/language/collection/views/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/language/collection/views/manifests.ts @@ -1,24 +1,23 @@ import { UMB_COLLECTION_ALIAS_CONDITION } from '@umbraco-cms/backoffice/collection'; -import type { ManifestCollectionView, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; export const UMB_LANGUAGE_TABLE_COLLECTION_VIEW_ALIAS = 'Umb.CollectionView.Language.Table'; -const tableCollectionView: ManifestCollectionView = { - type: 'collectionView', - alias: UMB_LANGUAGE_TABLE_COLLECTION_VIEW_ALIAS, - name: 'Language Table Collection View', - js: () => import('./table/language-table-collection-view.element.js'), - meta: { - label: 'Table', - icon: 'icon-list', - pathName: 'table', - }, - conditions: [ - { - alias: UMB_COLLECTION_ALIAS_CONDITION, - match: 'Umb.Collection.Language', +export const manifests: Array = [ + { + type: 'collectionView', + alias: UMB_LANGUAGE_TABLE_COLLECTION_VIEW_ALIAS, + name: 'Language Table Collection View', + js: () => import('./table/language-table-collection-view.element.js'), + meta: { + label: 'Table', + icon: 'icon-list', + pathName: 'table', }, - ], -}; - -export const manifests: Array = [tableCollectionView]; + conditions: [ + { + alias: UMB_COLLECTION_ALIAS_CONDITION, + match: 'Umb.Collection.Language', + }, + ], + }, +]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/collection/action/create-media-collection-action.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/collection/action/create-media-collection-action.element.ts index 349aef3f0d..8c52336ef3 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/collection/action/create-media-collection-action.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/collection/action/create-media-collection-action.element.ts @@ -7,7 +7,7 @@ import { UmbMediaTypeStructureRepository } from '@umbraco-cms/backoffice/media-t import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { UMB_WORKSPACE_MODAL } from '@umbraco-cms/backoffice/modal'; import { UmbModalRouteRegistrationController } from '@umbraco-cms/backoffice/router'; -import type { ManifestCollectionAction } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestCollectionAction } from '@umbraco-cms/backoffice/collection'; import type { UmbAllowedMediaTypeModel } from '@umbraco-cms/backoffice/media-type'; @customElement('umb-create-media-collection-action') diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/collection/action/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/collection/action/manifests.ts index fba02fde58..0ee41ec6a8 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/collection/action/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/collection/action/manifests.ts @@ -1,22 +1,21 @@ import { UMB_COLLECTION_ALIAS_CONDITION } from '@umbraco-cms/backoffice/collection'; -import type { ManifestCollectionAction, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; -export const createManifest: ManifestCollectionAction = { - type: 'collectionAction', - kind: 'button', - name: 'Create Media Collection Action', - alias: 'Umb.CollectionAction.Media.Create', - element: () => import('./create-media-collection-action.element.js'), - weight: 100, - meta: { - label: '#general_create', - }, - conditions: [ - { - alias: UMB_COLLECTION_ALIAS_CONDITION, - match: 'Umb.Collection.Media', +export const manifests: Array = [ + { + type: 'collectionAction', + kind: 'button', + name: 'Create Media Collection Action', + alias: 'Umb.CollectionAction.Media.Create', + element: () => import('./create-media-collection-action.element.js'), + weight: 100, + meta: { + label: '#general_create', }, - ], -}; - -export const manifests: Array = [createManifest]; + conditions: [ + { + alias: UMB_COLLECTION_ALIAS_CONDITION, + match: 'Umb.Collection.Media', + }, + ], + }, +]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/collection/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/collection/manifests.ts index 876abdb9d0..381f392247 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/collection/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/collection/manifests.ts @@ -3,21 +3,18 @@ import { manifests as collectionActionManifests } from './action/manifests.js'; import { manifests as collectionRepositoryManifests } from './repository/manifests.js'; import { manifests as collectionViewManifests } from './views/manifests.js'; import { UMB_MEDIA_COLLECTION_ALIAS } from './index.js'; -import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; -const collectionManifest: ManifestTypes = { - type: 'collection', - alias: UMB_MEDIA_COLLECTION_ALIAS, - name: 'Media Collection', - api: () => import('./media-collection.context.js'), - element: () => import('./media-collection.element.js'), - meta: { - repositoryAlias: UMB_MEDIA_COLLECTION_REPOSITORY_ALIAS, +export const manifests: Array = [ + { + type: 'collection', + alias: UMB_MEDIA_COLLECTION_ALIAS, + name: 'Media Collection', + api: () => import('./media-collection.context.js'), + element: () => import('./media-collection.element.js'), + meta: { + repositoryAlias: UMB_MEDIA_COLLECTION_REPOSITORY_ALIAS, + }, }, -}; - -export const manifests: Array = [ - collectionManifest, ...collectionActionManifests, ...collectionRepositoryManifests, ...collectionViewManifests, diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/collection/views/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/collection/views/manifests.ts index 1f82ccba39..3dd5ffc189 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/collection/views/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/collection/views/manifests.ts @@ -1,6 +1,7 @@ import { UMB_MEDIA_GRID_COLLECTION_VIEW_ALIAS, UMB_MEDIA_TABLE_COLLECTION_VIEW_ALIAS } from './index.js'; import { UMB_COLLECTION_ALIAS_CONDITION } from '@umbraco-cms/backoffice/collection'; -import type { ManifestCollectionView, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestCollectionView } from '@umbraco-cms/backoffice/collection'; const gridViewManifest: ManifestCollectionView = { type: 'collectionView', diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member-group/collection/action/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-group/collection/action/manifests.ts index 4234fa71fe..ea60b14b0e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/members/member-group/collection/action/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/member-group/collection/action/manifests.ts @@ -1,22 +1,21 @@ import { UMB_COLLECTION_ALIAS_CONDITION } from '@umbraco-cms/backoffice/collection'; -import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; -export const createManifest: ManifestTypes = { - type: 'collectionAction', - kind: 'button', - name: 'Create Member Group Collection Action', - alias: 'Umb.CollectionAction.MemberGroup.Create', - weight: 200, - meta: { - label: '#general_create', - href: 'section/member-management/workspace/member-group/create', - }, - conditions: [ - { - alias: UMB_COLLECTION_ALIAS_CONDITION, - match: 'Umb.Collection.MemberGroup', +export const manifests: Array = [ + { + type: 'collectionAction', + kind: 'button', + name: 'Create Member Group Collection Action', + alias: 'Umb.CollectionAction.MemberGroup.Create', + weight: 200, + meta: { + label: '#general_create', + href: 'section/member-management/workspace/member-group/create', }, - ], -}; - -export const manifests: Array = [createManifest]; + conditions: [ + { + alias: UMB_COLLECTION_ALIAS_CONDITION, + match: 'Umb.Collection.MemberGroup', + }, + ], + }, +]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member-group/collection/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-group/collection/manifests.ts index 12a22aa1af..11056c21db 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/members/member-group/collection/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/member-group/collection/manifests.ts @@ -2,22 +2,19 @@ import { UMB_MEMBER_GROUP_COLLECTION_REPOSITORY_ALIAS } from './repository/index import { manifests as collectionRepositoryManifests } from './repository/manifests.js'; import { manifests as collectionViewManifests } from './views/manifests.js'; import { manifests as collectionActionManifests } from './action/manifests.js'; -import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; export const UMB_MEMBER_GROUP_COLLECTION_ALIAS = 'Umb.Collection.MemberGroup'; -const collectionManifest: ManifestTypes = { - type: 'collection', - kind: 'default', - alias: UMB_MEMBER_GROUP_COLLECTION_ALIAS, - name: 'Member Group Collection', - meta: { - repositoryAlias: UMB_MEMBER_GROUP_COLLECTION_REPOSITORY_ALIAS, +export const manifests: Array = [ + { + type: 'collection', + kind: 'default', + alias: UMB_MEMBER_GROUP_COLLECTION_ALIAS, + name: 'Member Group Collection', + meta: { + repositoryAlias: UMB_MEMBER_GROUP_COLLECTION_REPOSITORY_ALIAS, + }, }, -}; - -export const manifests: Array = [ - collectionManifest, ...collectionRepositoryManifests, ...collectionViewManifests, ...collectionActionManifests, diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member-group/collection/views/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-group/collection/views/manifests.ts index 47dd869885..8fbee95347 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/members/member-group/collection/views/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/member-group/collection/views/manifests.ts @@ -1,24 +1,23 @@ import { UMB_COLLECTION_ALIAS_CONDITION } from '@umbraco-cms/backoffice/collection'; -import type { ManifestCollectionView, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; export const UMB_MEMBER_GROUP_TABLE_COLLECTION_VIEW_ALIAS = 'Umb.CollectionView.MemberGroup.Table'; -const tableCollectionView: ManifestCollectionView = { - type: 'collectionView', - alias: UMB_MEMBER_GROUP_TABLE_COLLECTION_VIEW_ALIAS, - name: 'Member Group Table Collection View', - element: () => import('./table/member-group-table-collection-view.element.js'), - meta: { - label: 'Table', - icon: 'icon-list', - pathName: 'table', - }, - conditions: [ - { - alias: UMB_COLLECTION_ALIAS_CONDITION, - match: 'Umb.Collection.MemberGroup', +export const manifests: Array = [ + { + type: 'collectionView', + alias: UMB_MEMBER_GROUP_TABLE_COLLECTION_VIEW_ALIAS, + name: 'Member Group Table Collection View', + element: () => import('./table/member-group-table-collection-view.element.js'), + meta: { + label: 'Table', + icon: 'icon-list', + pathName: 'table', }, - ], -}; - -export const manifests: Array = [tableCollectionView]; + conditions: [ + { + alias: UMB_COLLECTION_ALIAS_CONDITION, + match: 'Umb.Collection.MemberGroup', + }, + ], + }, +]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member/collection/action/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member/collection/action/manifests.ts index 336d9bde42..a9da38f9d0 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/members/member/collection/action/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/member/collection/action/manifests.ts @@ -1,24 +1,23 @@ import { UMB_COLLECTION_ALIAS_CONDITION } from '@umbraco-cms/backoffice/collection'; -import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; -export const createManifest: ManifestTypes = { - type: 'collectionAction', - name: 'Create Member Collection Action', - kind: 'button', - alias: 'Umb.CollectionAction.Member.Create', - weight: 200, - meta: { - label: '#general_create', - href: 'section/member-management/workspace/member/create/member-type-1-id', // TODO: remove hardcoded member type id - }, - js: () => import('./create-member-collection-action.element.js'), - conditions: [ - { - alias: UMB_COLLECTION_ALIAS_CONDITION, - match: 'Umb.Collection.Member', +export const manifests: Array = [ + { + type: 'collectionAction', + name: 'Create Member Collection Action', + kind: 'button', + alias: 'Umb.CollectionAction.Member.Create', + weight: 200, + meta: { + label: '#general_create', + href: 'section/member-management/workspace/member/create/member-type-1-id', // TODO: remove hardcoded member type id }, - ], - // element: () => import('./create-member-collection-action.element.js'), -}; - -export const manifests: Array = [createManifest]; + js: () => import('./create-member-collection-action.element.js'), + conditions: [ + { + alias: UMB_COLLECTION_ALIAS_CONDITION, + match: 'Umb.Collection.Member', + }, + ], + // element: () => import('./create-member-collection-action.element.js'), + }, +]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member/collection/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member/collection/manifests.ts index 06239362fe..ad18582106 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/members/member/collection/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/member/collection/manifests.ts @@ -2,23 +2,20 @@ import { UMB_MEMBER_COLLECTION_REPOSITORY_ALIAS } from './repository/index.js'; import { manifests as collectionRepositoryManifests } from './repository/manifests.js'; import { manifests as collectionViewManifests } from './views/manifests.js'; import { manifests as collectionActionManifests } from './action/manifests.js'; -import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; export const UMB_MEMBER_COLLECTION_ALIAS = 'Umb.Collection.Member'; -const collectionManifest: ManifestTypes = { - type: 'collection', - alias: UMB_MEMBER_COLLECTION_ALIAS, - name: 'Member Collection', - api: () => import('./member-collection.context.js'), - element: () => import('./member-collection.element.js'), - meta: { - repositoryAlias: UMB_MEMBER_COLLECTION_REPOSITORY_ALIAS, +export const manifests: Array = [ + { + type: 'collection', + alias: UMB_MEMBER_COLLECTION_ALIAS, + name: 'Member Collection', + api: () => import('./member-collection.context.js'), + element: () => import('./member-collection.element.js'), + meta: { + repositoryAlias: UMB_MEMBER_COLLECTION_REPOSITORY_ALIAS, + }, }, -}; - -export const manifests: Array = [ - collectionManifest, ...collectionRepositoryManifests, ...collectionViewManifests, ...collectionActionManifests, diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member/collection/views/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member/collection/views/manifests.ts index 386021aaf6..1ac801b7ea 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/members/member/collection/views/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/member/collection/views/manifests.ts @@ -1,24 +1,23 @@ import { UMB_COLLECTION_ALIAS_CONDITION } from '@umbraco-cms/backoffice/collection'; -import type { ManifestCollectionView, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; export const UMB_MEMBER_TABLE_COLLECTION_VIEW_ALIAS = 'Umb.CollectionView.Member.Table'; -const tableCollectionView: ManifestCollectionView = { - type: 'collectionView', - alias: UMB_MEMBER_TABLE_COLLECTION_VIEW_ALIAS, - name: 'Member Table Collection View', - element: () => import('./table/member-table-collection-view.element.js'), - meta: { - label: 'Table', - icon: 'icon-list', - pathName: 'table', - }, - conditions: [ - { - alias: UMB_COLLECTION_ALIAS_CONDITION, - match: 'Umb.Collection.Member', +export const manifests: Array = [ + { + type: 'collectionView', + alias: UMB_MEMBER_TABLE_COLLECTION_VIEW_ALIAS, + name: 'Member Table Collection View', + element: () => import('./table/member-table-collection-view.element.js'), + meta: { + label: 'Table', + icon: 'icon-list', + pathName: 'table', }, - ], -}; - -export const manifests: Array = [tableCollectionView]; + conditions: [ + { + alias: UMB_COLLECTION_ALIAS_CONDITION, + match: 'Umb.Collection.Member', + }, + ], + }, +]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/collection/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/collection/manifests.ts index 92464432af..7beee2df3f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/collection/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/collection/manifests.ts @@ -2,21 +2,18 @@ import { UMB_RELATION_TYPE_COLLECTION_ALIAS } from './constants.js'; import { UMB_RELATION_TYPE_COLLECTION_REPOSITORY_ALIAS } from './repository/index.js'; import { manifests as collectionRepositoryManifests } from './repository/manifests.js'; import { manifests as collectionViewManifests } from './views/manifests.js'; -import type { ManifestCollection, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; -const collectionManifest: ManifestCollection = { - type: 'collection', - kind: 'default', - alias: UMB_RELATION_TYPE_COLLECTION_ALIAS, - name: 'Relation Type Collection', - element: () => import('./relation-type-collection.element.js'), - meta: { - repositoryAlias: UMB_RELATION_TYPE_COLLECTION_REPOSITORY_ALIAS, +export const manifests: Array = [ + { + type: 'collection', + kind: 'default', + alias: UMB_RELATION_TYPE_COLLECTION_ALIAS, + name: 'Relation Type Collection', + element: () => import('./relation-type-collection.element.js'), + meta: { + repositoryAlias: UMB_RELATION_TYPE_COLLECTION_REPOSITORY_ALIAS, + }, }, -}; - -export const manifests: Array = [ - collectionManifest, ...collectionRepositoryManifests, ...collectionViewManifests, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/collection/views/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/collection/views/manifests.ts index c23a96afb8..664d9c9602 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/collection/views/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/collection/views/manifests.ts @@ -1,22 +1,21 @@ import { UMB_COLLECTION_ALIAS_CONDITION } from '@umbraco-cms/backoffice/collection'; -import type { ManifestCollectionView, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; -const tableCollectionView: ManifestCollectionView = { - type: 'collectionView', - alias: 'Umb.CollectionView.RelationType.Table', - name: 'Relation Type Table Collection View', - js: () => import('./table/relation-type-table-collection-view.element.js'), - meta: { - label: 'Table', - icon: 'icon-list', - pathName: 'table', - }, - conditions: [ - { - alias: UMB_COLLECTION_ALIAS_CONDITION, - match: 'Umb.Collection.RelationType', +export const manifests: Array = [ + { + type: 'collectionView', + alias: 'Umb.CollectionView.RelationType.Table', + name: 'Relation Type Table Collection View', + js: () => import('./table/relation-type-table-collection-view.element.js'), + meta: { + label: 'Table', + icon: 'icon-list', + pathName: 'table', }, - ], -}; - -export const manifests: Array = [tableCollectionView]; + conditions: [ + { + alias: UMB_COLLECTION_ALIAS_CONDITION, + match: 'Umb.Collection.RelationType', + }, + ], + }, +]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/action/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/action/manifests.ts index 3f67cc84e1..90b5371fa3 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/action/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/action/manifests.ts @@ -1,23 +1,22 @@ import { UMB_USER_GROUP_WORKSPACE_PATH } from '../../paths.js'; import { UMB_COLLECTION_ALIAS_CONDITION } from '@umbraco-cms/backoffice/collection'; -import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; -export const createManifest: ManifestTypes = { - type: 'collectionAction', - kind: 'button', - name: 'Create User Group Collection Action', - alias: 'Umb.CollectionAction.UserGroup.Create', - weight: 200, - meta: { - label: '#general_create', - href: `${UMB_USER_GROUP_WORKSPACE_PATH}/create`, - }, - conditions: [ - { - alias: UMB_COLLECTION_ALIAS_CONDITION, - match: 'Umb.Collection.UserGroup', +export const manifests: Array = [ + { + type: 'collectionAction', + kind: 'button', + name: 'Create User Group Collection Action', + alias: 'Umb.CollectionAction.UserGroup.Create', + weight: 200, + meta: { + label: '#general_create', + href: `${UMB_USER_GROUP_WORKSPACE_PATH}/create`, }, - ], -}; - -export const manifests: Array = [createManifest]; + conditions: [ + { + alias: UMB_COLLECTION_ALIAS_CONDITION, + match: 'Umb.Collection.UserGroup', + }, + ], + }, +]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/manifests.ts index 04295c9ab8..39b0aa78fc 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/manifests.ts @@ -3,21 +3,18 @@ import { manifests as collectionViewManifests } from './views/manifests.js'; import { manifests as collectionActionManifests } from './action/manifests.js'; import { UMB_USER_GROUP_COLLECTION_ALIAS } from './constants.js'; import { UMB_USER_GROUP_COLLECTION_REPOSITORY_ALIAS } from './repository/constants.js'; -import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; -const collection: ManifestTypes = { - type: 'collection', - alias: UMB_USER_GROUP_COLLECTION_ALIAS, - name: 'User Group Collection', - api: () => import('./user-group-collection.context.js'), - element: () => import('./user-group-collection.element.js'), - meta: { - repositoryAlias: UMB_USER_GROUP_COLLECTION_REPOSITORY_ALIAS, +export const manifests: Array = [ + { + type: 'collection', + alias: UMB_USER_GROUP_COLLECTION_ALIAS, + name: 'User Group Collection', + api: () => import('./user-group-collection.context.js'), + element: () => import('./user-group-collection.element.js'), + meta: { + repositoryAlias: UMB_USER_GROUP_COLLECTION_REPOSITORY_ALIAS, + }, }, -}; - -export const manifests: Array = [ - collection, ...repositoryManifests, ...collectionViewManifests, ...collectionActionManifests, diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/views/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/views/manifests.ts index 8bae405e41..5c4c8a9f95 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/views/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/views/manifests.ts @@ -1,23 +1,22 @@ import { UMB_USER_GROUP_TABLE_COLLECTION_VIEW_ALIAS } from './constants.js'; import { UMB_COLLECTION_ALIAS_CONDITION } from '@umbraco-cms/backoffice/collection'; -import type { ManifestCollectionView, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; -const tableCollectionView: ManifestCollectionView = { - type: 'collectionView', - alias: UMB_USER_GROUP_TABLE_COLLECTION_VIEW_ALIAS, - name: 'User Group Table Collection View', - js: () => import('./user-group-table-collection-view.element.js'), - meta: { - label: 'Table', - icon: 'icon-list', - pathName: 'table', - }, - conditions: [ - { - alias: UMB_COLLECTION_ALIAS_CONDITION, - match: 'Umb.Collection.UserGroup', +export const manifests: Array = [ + { + type: 'collectionView', + alias: UMB_USER_GROUP_TABLE_COLLECTION_VIEW_ALIAS, + name: 'User Group Table Collection View', + js: () => import('./user-group-table-collection-view.element.js'), + meta: { + label: 'Table', + icon: 'icon-list', + pathName: 'table', }, - ], -}; - -export const manifests: Array = [tableCollectionView]; + conditions: [ + { + alias: UMB_COLLECTION_ALIAS_CONDITION, + match: 'Umb.Collection.UserGroup', + }, + ], + }, +]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/action/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/action/manifests.ts index 204d4cd117..70aa992311 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/action/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/action/manifests.ts @@ -1,18 +1,17 @@ import { UMB_COLLECTION_ALIAS_CONDITION } from '@umbraco-cms/backoffice/collection'; -import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; -export const createManifest: ManifestTypes = { - type: 'collectionAction', - name: 'Create User Collection Action', - alias: 'Umb.CollectionAction.User.Create', - element: () => import('./create-user-collection-action.element.js'), - weight: 200, - conditions: [ - { - alias: UMB_COLLECTION_ALIAS_CONDITION, - match: 'Umb.Collection.User', - }, - ], -}; - -export const manifests: Array = [createManifest]; +export const manifests: Array = [ + { + type: 'collectionAction', + name: 'Create User Collection Action', + alias: 'Umb.CollectionAction.User.Create', + element: () => import('./create-user-collection-action.element.js'), + weight: 200, + conditions: [ + { + alias: UMB_COLLECTION_ALIAS_CONDITION, + match: 'Umb.Collection.User', + }, + ], + }, +]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/manifests.ts index 72741e772e..b54121406d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/manifests.ts @@ -3,21 +3,18 @@ import { manifests as collectionRepositoryManifests } from './repository/manifes import { manifests as collectionViewManifests } from './views/manifests.js'; import { manifests as collectionActionManifests } from './action/manifests.js'; import { UMB_USER_COLLECTION_ALIAS } from './constants.js'; -import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; -const collectionManifest: ManifestTypes = { - type: 'collection', - alias: UMB_USER_COLLECTION_ALIAS, - name: 'User Collection', - api: () => import('./user-collection.context.js'), - element: () => import('./user-collection.element.js'), - meta: { - repositoryAlias: UMB_USER_COLLECTION_REPOSITORY_ALIAS, +export const manifests: Array = [ + { + type: 'collection', + alias: UMB_USER_COLLECTION_ALIAS, + name: 'User Collection', + api: () => import('./user-collection.context.js'), + element: () => import('./user-collection.element.js'), + meta: { + repositoryAlias: UMB_USER_COLLECTION_REPOSITORY_ALIAS, + }, }, -}; - -export const manifests: Array = [ - collectionManifest, ...collectionRepositoryManifests, ...collectionViewManifests, ...collectionActionManifests, From 316126b8c934e6f1003945b1ba436ea7375b4391 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Fri, 13 Sep 2024 14:27:06 +0200 Subject: [PATCH 36/43] lower case u --- .../src/packages/block/block/conditions/types.ts | 2 +- .../src/packages/core/workspace/conditions/types.ts | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block/conditions/types.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/conditions/types.ts index b7d4e6f2ae..90b96ec552 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block/conditions/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block/conditions/types.ts @@ -8,6 +8,6 @@ export type BlockEntryShowContentEditConditionConfig = declare global { interface UmbExtensionConditionMap { - UmbBlock: BlockEntryShowContentEditConditionConfig | BlockWorkspaceHasSettingsConditionConfig; + umbBlock: BlockEntryShowContentEditConditionConfig | BlockWorkspaceHasSettingsConditionConfig; } } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/conditions/types.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/conditions/types.ts index 9f4d0fc1b0..1dbba27b51 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/conditions/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/conditions/types.ts @@ -47,9 +47,9 @@ export type WorkspaceHasCollectionConditionConfig = UmbConditionConfigBase< declare global { interface UmbExtensionConditionMap { - UmbWorkspaceAlias: WorkspaceAliasConditionConfig; - UmbWorkspaceContentTypeAlias: WorkspaceContentTypeAliasConditionConfig; - UmbWorkspaceEntityType: WorkspaceEntityTypeConditionConfig; - UmbWorkspaceHasCollection: WorkspaceHasCollectionConditionConfig; + umbWorkspaceAlias: WorkspaceAliasConditionConfig; + umbWorkspaceContentTypeAlias: WorkspaceContentTypeAliasConditionConfig; + umbWorkspaceEntityType: WorkspaceEntityTypeConditionConfig; + umbWorkspaceHasCollection: WorkspaceHasCollectionConditionConfig; } } From 15fc5a3fc6d65d03f732653954ef96ab0cbedb47 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Fri, 13 Sep 2024 15:09:40 +0200 Subject: [PATCH 37/43] setup extension insight as a package --- .../src/apps/backoffice/backoffice.element.ts | 1 + .../collection/manifests.ts | 24 ------------------ .../collection/views/manifests.ts | 25 ------------------- .../core/extension-registry/manifests.ts | 12 +-------- .../extension-collection.element.ts | 2 +- .../extension-insight/collection/manifests.ts | 20 +++++++++++++++ .../extension-collection.repository.ts | 2 +- .../collection/repository/index.ts | 0 .../collection/repository/manifests.ts | 0 .../collection/types.ts | 0 .../collection/views/manifests.ts | 23 +++++++++++++++++ ...extension-table-collection-view.element.ts | 0 ...le-entity-actions-column-layout.element.ts | 0 .../entity-actions/manifests.ts | 0 .../entity-actions/unregister/index.ts | 0 .../entity-actions/unregister/manifests.ts | 0 .../unregister/unregister-extension.action.ts | 2 +- .../entity.ts | 0 .../packages/extension-insight/manifests.ts | 11 ++++++++ .../menu-item/manifests.ts | 0 .../packages/extension-insight/package.json | 8 ++++++ .../extension-insight/umbraco-package.ts | 9 +++++++ .../packages/extension-insight/vite.config.ts | 12 +++++++++ .../extension-root-workspace.element.ts | 0 .../extension-root-workspace.stories.ts | 0 .../workspace/manifests.ts | 0 26 files changed, 88 insertions(+), 63 deletions(-) delete mode 100644 src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/collection/manifests.ts delete mode 100644 src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/collection/views/manifests.ts rename src/Umbraco.Web.UI.Client/src/packages/{core/extension-registry => extension-insight}/collection/extension-collection.element.ts (96%) create mode 100644 src/Umbraco.Web.UI.Client/src/packages/extension-insight/collection/manifests.ts rename src/Umbraco.Web.UI.Client/src/packages/{core/extension-registry => extension-insight}/collection/repository/extension-collection.repository.ts (94%) rename src/Umbraco.Web.UI.Client/src/packages/{core/extension-registry => extension-insight}/collection/repository/index.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{core/extension-registry => extension-insight}/collection/repository/manifests.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{core/extension-registry => extension-insight}/collection/types.ts (100%) create mode 100644 src/Umbraco.Web.UI.Client/src/packages/extension-insight/collection/views/manifests.ts rename src/Umbraco.Web.UI.Client/src/packages/{core/extension-registry => extension-insight}/collection/views/table/extension-table-collection-view.element.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{core/extension-registry => extension-insight}/collection/views/table/extension-table-entity-actions-column-layout.element.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{core/extension-registry => extension-insight}/entity-actions/manifests.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{core/extension-registry => extension-insight}/entity-actions/unregister/index.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{core/extension-registry => extension-insight}/entity-actions/unregister/manifests.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{core/extension-registry => extension-insight}/entity-actions/unregister/unregister-extension.action.ts (93%) rename src/Umbraco.Web.UI.Client/src/packages/{core/extension-registry => extension-insight}/entity.ts (100%) create mode 100644 src/Umbraco.Web.UI.Client/src/packages/extension-insight/manifests.ts rename src/Umbraco.Web.UI.Client/src/packages/{core/extension-registry => extension-insight}/menu-item/manifests.ts (100%) create mode 100644 src/Umbraco.Web.UI.Client/src/packages/extension-insight/package.json create mode 100644 src/Umbraco.Web.UI.Client/src/packages/extension-insight/umbraco-package.ts create mode 100644 src/Umbraco.Web.UI.Client/src/packages/extension-insight/vite.config.ts rename src/Umbraco.Web.UI.Client/src/packages/{core/extension-registry => extension-insight}/workspace/extension-root-workspace.element.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{core/extension-registry => extension-insight}/workspace/extension-root-workspace.stories.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{core/extension-registry => extension-insight}/workspace/manifests.ts (100%) 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 d54b7fc79e..52f5e00322 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 @@ -17,6 +17,7 @@ const CORE_PACKAGES = [ import('../../packages/data-type/umbraco-package.js'), import('../../packages/dictionary/umbraco-package.js'), import('../../packages/documents/umbraco-package.js'), + import('../../packages/extension-insight/umbraco-package.js'), import('../../packages/health-check/umbraco-package.js'), import('../../packages/help/umbraco-package.js'), import('../../packages/language/umbraco-package.js'), diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/collection/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/collection/manifests.ts deleted file mode 100644 index 3d2fcf1205..0000000000 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/collection/manifests.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { UMB_EXTENSION_COLLECTION_REPOSITORY_ALIAS } from './repository/index.js'; -import { manifests as collectionRepositoryManifests } from './repository/manifests.js'; -import { manifests as collectionViewManifests } from './views/manifests.js'; -import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; -import type { ManifestCollection } from '@umbraco-cms/backoffice/collection'; - -export const UMB_EXTENSION_COLLECTION_ALIAS = 'Umb.Collection.Extension'; - -const collectionManifest: ManifestCollection = { - type: 'collection', - kind: 'default', - alias: UMB_EXTENSION_COLLECTION_ALIAS, - name: 'Extension Collection', - element: () => import('./extension-collection.element.js'), - meta: { - repositoryAlias: UMB_EXTENSION_COLLECTION_REPOSITORY_ALIAS, - }, -}; - -export const manifests: Array = [ - collectionManifest, - ...collectionRepositoryManifests, - ...collectionViewManifests, -]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/collection/views/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/collection/views/manifests.ts deleted file mode 100644 index 0fd5cf9fef..0000000000 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/collection/views/manifests.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { UMB_COLLECTION_ALIAS_CONDITION } from '@umbraco-cms/backoffice/collection'; -import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; -import type { ManifestCollectionView } from '@umbraco-cms/backoffice/collection'; - -export const UMB_EXTENSION_TABLE_COLLECTION_VIEW_ALIAS = 'Umb.CollectionView.Extension.Table'; - -const tableCollectionView: ManifestCollectionView = { - type: 'collectionView', - alias: UMB_EXTENSION_TABLE_COLLECTION_VIEW_ALIAS, - name: 'Extension Table Collection View', - element: () => import('./table/extension-table-collection-view.element.js'), - meta: { - label: 'Table', - icon: 'icon-list', - pathName: 'table', - }, - conditions: [ - { - alias: UMB_COLLECTION_ALIAS_CONDITION, - match: 'Umb.Collection.Extension', - }, - ], -}; - -export const manifests: Array = [tableCollectionView]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/manifests.ts index dd1a2d6e84..f8705be56e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/manifests.ts @@ -1,14 +1,4 @@ import { manifests as conditionManifests } from './conditions/manifests.js'; -import { manifests as menuItemManifests } from './menu-item/manifests.js'; -import { manifests as workspaceManifests } from './workspace/manifests.js'; -import { manifests as collectionManifests } from './collection/manifests.js'; -import { manifests as entityActionManifests } from './entity-actions/manifests.js'; import type { ManifestTypes } from './models/index.js'; -export const manifests: Array = [ - ...conditionManifests, - ...menuItemManifests, - ...workspaceManifests, - ...collectionManifests, - ...entityActionManifests, -]; +export const manifests: Array = [...conditionManifests]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/collection/extension-collection.element.ts b/src/Umbraco.Web.UI.Client/src/packages/extension-insight/collection/extension-collection.element.ts similarity index 96% rename from src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/collection/extension-collection.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/extension-insight/collection/extension-collection.element.ts index a57ef177a0..3c22b9e54a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/collection/extension-collection.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/extension-insight/collection/extension-collection.element.ts @@ -1,5 +1,5 @@ -import { umbExtensionsRegistry } from '../registry.js'; import type { UmbExtensionCollectionFilterModel } from './types.js'; +import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; import { html, customElement, css } from '@umbraco-cms/backoffice/external/lit'; import { fromCamelCase } from '@umbraco-cms/backoffice/utils'; import { UMB_COLLECTION_CONTEXT, UmbCollectionDefaultElement } from '@umbraco-cms/backoffice/collection'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/extension-insight/collection/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/extension-insight/collection/manifests.ts new file mode 100644 index 0000000000..750465b90d --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/extension-insight/collection/manifests.ts @@ -0,0 +1,20 @@ +import { UMB_EXTENSION_COLLECTION_REPOSITORY_ALIAS } from './repository/index.js'; +import { manifests as collectionRepositoryManifests } from './repository/manifests.js'; +import { manifests as collectionViewManifests } from './views/manifests.js'; + +export const UMB_EXTENSION_COLLECTION_ALIAS = 'Umb.Collection.Extension'; + +export const manifests: Array = [ + { + type: 'collection', + kind: 'default', + alias: UMB_EXTENSION_COLLECTION_ALIAS, + name: 'Extension Collection', + element: () => import('./extension-collection.element.js'), + meta: { + repositoryAlias: UMB_EXTENSION_COLLECTION_REPOSITORY_ALIAS, + }, + }, + ...collectionRepositoryManifests, + ...collectionViewManifests, +]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/collection/repository/extension-collection.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/extension-insight/collection/repository/extension-collection.repository.ts similarity index 94% rename from src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/collection/repository/extension-collection.repository.ts rename to src/Umbraco.Web.UI.Client/src/packages/extension-insight/collection/repository/extension-collection.repository.ts index 5daaac2129..a400517ce5 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/collection/repository/extension-collection.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/extension-insight/collection/repository/extension-collection.repository.ts @@ -1,6 +1,6 @@ -import { umbExtensionsRegistry } from '../../registry.js'; import type { UmbExtensionCollectionFilterModel, UmbExtensionDetailModel } from '../types.js'; import { UMB_EXTENSION_ENTITY_TYPE } from '../../entity.js'; +import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; import { UmbRepositoryBase } from '@umbraco-cms/backoffice/repository'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import type { UmbCollectionRepository } from '@umbraco-cms/backoffice/collection'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/collection/repository/index.ts b/src/Umbraco.Web.UI.Client/src/packages/extension-insight/collection/repository/index.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/collection/repository/index.ts rename to src/Umbraco.Web.UI.Client/src/packages/extension-insight/collection/repository/index.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/collection/repository/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/extension-insight/collection/repository/manifests.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/collection/repository/manifests.ts rename to src/Umbraco.Web.UI.Client/src/packages/extension-insight/collection/repository/manifests.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/collection/types.ts b/src/Umbraco.Web.UI.Client/src/packages/extension-insight/collection/types.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/collection/types.ts rename to src/Umbraco.Web.UI.Client/src/packages/extension-insight/collection/types.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/extension-insight/collection/views/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/extension-insight/collection/views/manifests.ts new file mode 100644 index 0000000000..097a9e5b25 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/extension-insight/collection/views/manifests.ts @@ -0,0 +1,23 @@ +import { UMB_COLLECTION_ALIAS_CONDITION } from '@umbraco-cms/backoffice/collection'; + +export const UMB_EXTENSION_TABLE_COLLECTION_VIEW_ALIAS = 'Umb.CollectionView.Extension.Table'; + +export const manifests: Array = [ + { + type: 'collectionView', + alias: UMB_EXTENSION_TABLE_COLLECTION_VIEW_ALIAS, + name: 'Extension Table Collection View', + element: () => import('./table/extension-table-collection-view.element.js'), + meta: { + label: 'Table', + icon: 'icon-list', + pathName: 'table', + }, + conditions: [ + { + alias: UMB_COLLECTION_ALIAS_CONDITION, + match: 'Umb.Collection.Extension', + }, + ], + }, +]; 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/extension-insight/collection/views/table/extension-table-collection-view.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/collection/views/table/extension-table-collection-view.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/extension-insight/collection/views/table/extension-table-collection-view.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/collection/views/table/extension-table-entity-actions-column-layout.element.ts b/src/Umbraco.Web.UI.Client/src/packages/extension-insight/collection/views/table/extension-table-entity-actions-column-layout.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/collection/views/table/extension-table-entity-actions-column-layout.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/extension-insight/collection/views/table/extension-table-entity-actions-column-layout.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/entity-actions/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/extension-insight/entity-actions/manifests.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/entity-actions/manifests.ts rename to src/Umbraco.Web.UI.Client/src/packages/extension-insight/entity-actions/manifests.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/entity-actions/unregister/index.ts b/src/Umbraco.Web.UI.Client/src/packages/extension-insight/entity-actions/unregister/index.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/entity-actions/unregister/index.ts rename to src/Umbraco.Web.UI.Client/src/packages/extension-insight/entity-actions/unregister/index.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/entity-actions/unregister/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/extension-insight/entity-actions/unregister/manifests.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/entity-actions/unregister/manifests.ts rename to src/Umbraco.Web.UI.Client/src/packages/extension-insight/entity-actions/unregister/manifests.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/entity-actions/unregister/unregister-extension.action.ts b/src/Umbraco.Web.UI.Client/src/packages/extension-insight/entity-actions/unregister/unregister-extension.action.ts similarity index 93% rename from src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/entity-actions/unregister/unregister-extension.action.ts rename to src/Umbraco.Web.UI.Client/src/packages/extension-insight/entity-actions/unregister/unregister-extension.action.ts index 019871bfbd..c904dc092d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/entity-actions/unregister/unregister-extension.action.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/extension-insight/entity-actions/unregister/unregister-extension.action.ts @@ -1,4 +1,4 @@ -import { umbExtensionsRegistry } from '../../registry.js'; +import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; import { UMB_ACTION_EVENT_CONTEXT } from '@umbraco-cms/backoffice/action'; import { UmbEntityActionBase, UmbRequestReloadStructureForEntityEvent } from '@umbraco-cms/backoffice/entity-action'; import { umbConfirmModal } from '@umbraco-cms/backoffice/modal'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/entity.ts b/src/Umbraco.Web.UI.Client/src/packages/extension-insight/entity.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/entity.ts rename to src/Umbraco.Web.UI.Client/src/packages/extension-insight/entity.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/extension-insight/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/extension-insight/manifests.ts new file mode 100644 index 0000000000..0507e6a8ee --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/extension-insight/manifests.ts @@ -0,0 +1,11 @@ +import { manifests as menuItemManifests } from './menu-item/manifests.js'; +import { manifests as workspaceManifests } from './workspace/manifests.js'; +import { manifests as collectionManifests } from './collection/manifests.js'; +import { manifests as entityActionManifests } from './entity-actions/manifests.js'; + +export const manifests: Array = [ + ...menuItemManifests, + ...workspaceManifests, + ...collectionManifests, + ...entityActionManifests, +]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/menu-item/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/extension-insight/menu-item/manifests.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/menu-item/manifests.ts rename to src/Umbraco.Web.UI.Client/src/packages/extension-insight/menu-item/manifests.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/extension-insight/package.json b/src/Umbraco.Web.UI.Client/src/packages/extension-insight/package.json new file mode 100644 index 0000000000..b9eeb6c15c --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/extension-insight/package.json @@ -0,0 +1,8 @@ +{ + "name": "@umbraco-backoffice/log-viewer", + "private": true, + "type": "module", + "scripts": { + "build": "vite build" + } +} \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/packages/extension-insight/umbraco-package.ts b/src/Umbraco.Web.UI.Client/src/packages/extension-insight/umbraco-package.ts new file mode 100644 index 0000000000..c9a7e12951 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/extension-insight/umbraco-package.ts @@ -0,0 +1,9 @@ +export const name = 'Umbraco.Core.ExtensionInsight'; +export const extensions = [ + { + name: 'Extension Insight Bundle', + alias: 'Umb.Bundle.ExtensionInsight', + type: 'bundle', + js: () => import('./manifests.js'), + }, +]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/extension-insight/vite.config.ts b/src/Umbraco.Web.UI.Client/src/packages/extension-insight/vite.config.ts new file mode 100644 index 0000000000..086063eb13 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/extension-insight/vite.config.ts @@ -0,0 +1,12 @@ +import { defineConfig } from 'vite'; +import { rmSync } from 'fs'; +import { getDefaultConfig } from '../../vite-config-base'; + +const dist = '../../../dist-cms/packages/webhook'; + +// delete the unbundled dist folder +rmSync(dist, { recursive: true, force: true }); + +export default defineConfig({ + ...getDefaultConfig({ dist, entry: ['manifests.ts', 'umbraco-package.ts'] }), +}); 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/extension-insight/workspace/extension-root-workspace.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/workspace/extension-root-workspace.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/extension-insight/workspace/extension-root-workspace.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/workspace/extension-root-workspace.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/extension-insight/workspace/extension-root-workspace.stories.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/workspace/extension-root-workspace.stories.ts rename to src/Umbraco.Web.UI.Client/src/packages/extension-insight/workspace/extension-root-workspace.stories.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/workspace/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/extension-insight/workspace/manifests.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/workspace/manifests.ts rename to src/Umbraco.Web.UI.Client/src/packages/extension-insight/workspace/manifests.ts From 894975b2641fb3e2b6aa372a85e747e305621d91 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Fri, 13 Sep 2024 15:36:13 +0200 Subject: [PATCH 38/43] rename folder --- .../collection/extension-collection.element.ts | 0 .../collection/manifests.ts | 0 .../collection/repository/extension-collection.repository.ts | 0 .../collection/repository/index.ts | 0 .../collection/repository/manifests.ts | 0 .../collection/types.ts | 0 .../collection/views/manifests.ts | 0 .../views/table/extension-table-collection-view.element.ts | 0 .../extension-table-entity-actions-column-layout.element.ts | 0 .../entity-actions/manifests.ts | 0 .../entity-actions/unregister/index.ts | 0 .../entity-actions/unregister/manifests.ts | 0 .../entity-actions/unregister/unregister-extension.action.ts | 0 .../{extension-insight => extension-insights}/entity.ts | 0 .../{extension-insight => extension-insights}/manifests.ts | 0 .../menu-item/manifests.ts | 0 .../{extension-insight => extension-insights}/package.json | 2 +- .../umbraco-package.ts | 0 .../{extension-insight => extension-insights}/vite.config.ts | 2 +- .../workspace/extension-root-workspace.element.ts | 0 .../workspace/extension-root-workspace.stories.ts | 0 .../workspace/manifests.ts | 0 22 files changed, 2 insertions(+), 2 deletions(-) rename src/Umbraco.Web.UI.Client/src/packages/{extension-insight => extension-insights}/collection/extension-collection.element.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{extension-insight => extension-insights}/collection/manifests.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{extension-insight => extension-insights}/collection/repository/extension-collection.repository.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{extension-insight => extension-insights}/collection/repository/index.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{extension-insight => extension-insights}/collection/repository/manifests.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{extension-insight => extension-insights}/collection/types.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{extension-insight => extension-insights}/collection/views/manifests.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{extension-insight => extension-insights}/collection/views/table/extension-table-collection-view.element.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{extension-insight => extension-insights}/collection/views/table/extension-table-entity-actions-column-layout.element.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{extension-insight => extension-insights}/entity-actions/manifests.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{extension-insight => extension-insights}/entity-actions/unregister/index.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{extension-insight => extension-insights}/entity-actions/unregister/manifests.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{extension-insight => extension-insights}/entity-actions/unregister/unregister-extension.action.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{extension-insight => extension-insights}/entity.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{extension-insight => extension-insights}/manifests.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{extension-insight => extension-insights}/menu-item/manifests.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{extension-insight => extension-insights}/package.json (61%) rename src/Umbraco.Web.UI.Client/src/packages/{extension-insight => extension-insights}/umbraco-package.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{extension-insight => extension-insights}/vite.config.ts (83%) rename src/Umbraco.Web.UI.Client/src/packages/{extension-insight => extension-insights}/workspace/extension-root-workspace.element.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{extension-insight => extension-insights}/workspace/extension-root-workspace.stories.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{extension-insight => extension-insights}/workspace/manifests.ts (100%) diff --git a/src/Umbraco.Web.UI.Client/src/packages/extension-insight/collection/extension-collection.element.ts b/src/Umbraco.Web.UI.Client/src/packages/extension-insights/collection/extension-collection.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/extension-insight/collection/extension-collection.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/extension-insights/collection/extension-collection.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/extension-insight/collection/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/extension-insights/collection/manifests.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/extension-insight/collection/manifests.ts rename to src/Umbraco.Web.UI.Client/src/packages/extension-insights/collection/manifests.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/extension-insight/collection/repository/extension-collection.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/extension-insights/collection/repository/extension-collection.repository.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/extension-insight/collection/repository/extension-collection.repository.ts rename to src/Umbraco.Web.UI.Client/src/packages/extension-insights/collection/repository/extension-collection.repository.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/extension-insight/collection/repository/index.ts b/src/Umbraco.Web.UI.Client/src/packages/extension-insights/collection/repository/index.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/extension-insight/collection/repository/index.ts rename to src/Umbraco.Web.UI.Client/src/packages/extension-insights/collection/repository/index.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/extension-insight/collection/repository/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/extension-insights/collection/repository/manifests.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/extension-insight/collection/repository/manifests.ts rename to src/Umbraco.Web.UI.Client/src/packages/extension-insights/collection/repository/manifests.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/extension-insight/collection/types.ts b/src/Umbraco.Web.UI.Client/src/packages/extension-insights/collection/types.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/extension-insight/collection/types.ts rename to src/Umbraco.Web.UI.Client/src/packages/extension-insights/collection/types.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/extension-insight/collection/views/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/extension-insights/collection/views/manifests.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/extension-insight/collection/views/manifests.ts rename to src/Umbraco.Web.UI.Client/src/packages/extension-insights/collection/views/manifests.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/extension-insight/collection/views/table/extension-table-collection-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/extension-insights/collection/views/table/extension-table-collection-view.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/extension-insight/collection/views/table/extension-table-collection-view.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/extension-insights/collection/views/table/extension-table-collection-view.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/extension-insight/collection/views/table/extension-table-entity-actions-column-layout.element.ts b/src/Umbraco.Web.UI.Client/src/packages/extension-insights/collection/views/table/extension-table-entity-actions-column-layout.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/extension-insight/collection/views/table/extension-table-entity-actions-column-layout.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/extension-insights/collection/views/table/extension-table-entity-actions-column-layout.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/extension-insight/entity-actions/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/extension-insights/entity-actions/manifests.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/extension-insight/entity-actions/manifests.ts rename to src/Umbraco.Web.UI.Client/src/packages/extension-insights/entity-actions/manifests.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/extension-insight/entity-actions/unregister/index.ts b/src/Umbraco.Web.UI.Client/src/packages/extension-insights/entity-actions/unregister/index.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/extension-insight/entity-actions/unregister/index.ts rename to src/Umbraco.Web.UI.Client/src/packages/extension-insights/entity-actions/unregister/index.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/extension-insight/entity-actions/unregister/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/extension-insights/entity-actions/unregister/manifests.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/extension-insight/entity-actions/unregister/manifests.ts rename to src/Umbraco.Web.UI.Client/src/packages/extension-insights/entity-actions/unregister/manifests.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/extension-insight/entity-actions/unregister/unregister-extension.action.ts b/src/Umbraco.Web.UI.Client/src/packages/extension-insights/entity-actions/unregister/unregister-extension.action.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/extension-insight/entity-actions/unregister/unregister-extension.action.ts rename to src/Umbraco.Web.UI.Client/src/packages/extension-insights/entity-actions/unregister/unregister-extension.action.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/extension-insight/entity.ts b/src/Umbraco.Web.UI.Client/src/packages/extension-insights/entity.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/extension-insight/entity.ts rename to src/Umbraco.Web.UI.Client/src/packages/extension-insights/entity.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/extension-insight/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/extension-insights/manifests.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/extension-insight/manifests.ts rename to src/Umbraco.Web.UI.Client/src/packages/extension-insights/manifests.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/extension-insight/menu-item/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/extension-insights/menu-item/manifests.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/extension-insight/menu-item/manifests.ts rename to src/Umbraco.Web.UI.Client/src/packages/extension-insights/menu-item/manifests.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/extension-insight/package.json b/src/Umbraco.Web.UI.Client/src/packages/extension-insights/package.json similarity index 61% rename from src/Umbraco.Web.UI.Client/src/packages/extension-insight/package.json rename to src/Umbraco.Web.UI.Client/src/packages/extension-insights/package.json index b9eeb6c15c..25e8983f7a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/extension-insight/package.json +++ b/src/Umbraco.Web.UI.Client/src/packages/extension-insights/package.json @@ -1,5 +1,5 @@ { - "name": "@umbraco-backoffice/log-viewer", + "name": "@umbraco-backoffice/extension-insights", "private": true, "type": "module", "scripts": { diff --git a/src/Umbraco.Web.UI.Client/src/packages/extension-insight/umbraco-package.ts b/src/Umbraco.Web.UI.Client/src/packages/extension-insights/umbraco-package.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/extension-insight/umbraco-package.ts rename to src/Umbraco.Web.UI.Client/src/packages/extension-insights/umbraco-package.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/extension-insight/vite.config.ts b/src/Umbraco.Web.UI.Client/src/packages/extension-insights/vite.config.ts similarity index 83% rename from src/Umbraco.Web.UI.Client/src/packages/extension-insight/vite.config.ts rename to src/Umbraco.Web.UI.Client/src/packages/extension-insights/vite.config.ts index 086063eb13..8e8a57e4b0 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/extension-insight/vite.config.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/extension-insights/vite.config.ts @@ -2,7 +2,7 @@ import { defineConfig } from 'vite'; import { rmSync } from 'fs'; import { getDefaultConfig } from '../../vite-config-base'; -const dist = '../../../dist-cms/packages/webhook'; +const dist = '../../../dist-cms/packages/extension-insights'; // delete the unbundled dist folder rmSync(dist, { recursive: true, force: true }); diff --git a/src/Umbraco.Web.UI.Client/src/packages/extension-insight/workspace/extension-root-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/packages/extension-insights/workspace/extension-root-workspace.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/extension-insight/workspace/extension-root-workspace.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/extension-insights/workspace/extension-root-workspace.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/extension-insight/workspace/extension-root-workspace.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/extension-insights/workspace/extension-root-workspace.stories.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/extension-insight/workspace/extension-root-workspace.stories.ts rename to src/Umbraco.Web.UI.Client/src/packages/extension-insights/workspace/extension-root-workspace.stories.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/extension-insight/workspace/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/extension-insights/workspace/manifests.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/extension-insight/workspace/manifests.ts rename to src/Umbraco.Web.UI.Client/src/packages/extension-insights/workspace/manifests.ts From 5d984cc31193484873d8048fb50757bde93e1ab9 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Fri, 13 Sep 2024 15:37:01 +0200 Subject: [PATCH 39/43] Update backoffice.element.ts --- .../src/apps/backoffice/backoffice.element.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 52f5e00322..efb18e9fa6 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 @@ -17,7 +17,7 @@ const CORE_PACKAGES = [ import('../../packages/data-type/umbraco-package.js'), import('../../packages/dictionary/umbraco-package.js'), import('../../packages/documents/umbraco-package.js'), - import('../../packages/extension-insight/umbraco-package.js'), + import('../../packages/extension-insights/umbraco-package.js'), import('../../packages/health-check/umbraco-package.js'), import('../../packages/help/umbraco-package.js'), import('../../packages/language/umbraco-package.js'), From 6e7b7398ffb852e4c34ab8b3243d63394b93f5b0 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Fri, 13 Sep 2024 15:39:10 +0200 Subject: [PATCH 40/43] Update package-lock.json --- src/Umbraco.Web.UI.Client/package-lock.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json index 4acffeedbd..c311f8f38f 100644 --- a/src/Umbraco.Web.UI.Client/package-lock.json +++ b/src/Umbraco.Web.UI.Client/package-lock.json @@ -7807,6 +7807,10 @@ "resolved": "src/packages/documents", "link": true }, + "node_modules/@umbraco-backoffice/extension-insights": { + "resolved": "src/packages/extension-insights", + "link": true + }, "node_modules/@umbraco-backoffice/health-check": { "resolved": "src/packages/health-check", "link": true @@ -23079,6 +23083,7 @@ "src/packages/documents": { "name": "@umbraco-backoffice/document" }, + "src/packages/extension-insights": {}, "src/packages/health-check": { "name": "@umbraco-backoffice/health-check" }, From 22f3a88c0071d11e561a6d683b5a0206c4713394 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Fri, 13 Sep 2024 17:05:01 +0200 Subject: [PATCH 41/43] move menu item conditions --- .../core/extension-registry/conditions/manifests.ts | 2 -- .../ui-culture-input/ui-culture-input.element.ts | 10 +++++----- .../core/menu/components/menu-item/link/manifests.ts | 4 +--- .../core/menu/components/menu-item/manifests.ts | 3 +-- .../conditions/menu-alias.condition.ts | 10 +++------- .../src/packages/core/menu/conditions/types.ts | 5 +++++ .../src/packages/core/menu/manifests.ts | 4 ++-- .../src/packages/core/menu/types.ts | 1 + .../section-main-views/section-main-views.element.ts | 11 ++++++----- 9 files changed, 24 insertions(+), 26 deletions(-) rename src/Umbraco.Web.UI.Client/src/packages/core/{extension-registry => menu}/conditions/menu-alias.condition.ts (76%) create mode 100644 src/Umbraco.Web.UI.Client/src/packages/core/menu/conditions/types.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/conditions/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/conditions/manifests.ts index 48b22385bb..e12a228710 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/conditions/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/conditions/manifests.ts @@ -1,11 +1,9 @@ import type { ManifestTypes } from '../models/index.js'; -import { manifest as menuAliasConditionManifest } from './menu-alias.condition.js'; import { manifest as multipleAppLanguagesConditionManifest } from './multiple-app-languages.condition.js'; import { manifest as sectionAliasConditionManifest } from './section-alias.condition.js'; import { manifest as switchConditionManifest } from './switch.condition.js'; export const manifests: Array = [ - menuAliasConditionManifest, multipleAppLanguagesConditionManifest, sectionAliasConditionManifest, switchConditionManifest, 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 813fd1050c..0b33a2fcf4 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 @@ -65,16 +65,16 @@ export class UmbUiCultureInputElement extends UUIFormControlMixin(UmbLitElement, } override render() { - return html` - ({ + .options=${this._options.map((e) => ({ name: e.name, value: e.value, - selected: e.value == this.value + selected: e.value == this.value, }))}> - `; + `; } static override styles = [ diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/menu/components/menu-item/link/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/menu/components/menu-item/link/manifests.ts index 1645bd2edc..5437c69989 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/menu/components/menu-item/link/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/menu/components/menu-item/link/manifests.ts @@ -1,6 +1,4 @@ -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; - -export const manifests: Array = [ +export const manifests: Array = [ { type: 'kind', alias: 'Umb.Kind.MenuItem.Link', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/menu/components/menu-item/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/menu/components/menu-item/manifests.ts index 08daa5be16..528da3258a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/menu/components/menu-item/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/menu/components/menu-item/manifests.ts @@ -1,4 +1,3 @@ import { manifests as linkManifests } from './link/manifests.js'; -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [...linkManifests]; +export const manifests: Array = [...linkManifests]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/conditions/menu-alias.condition.ts b/src/Umbraco.Web.UI.Client/src/packages/core/menu/conditions/menu-alias.condition.ts similarity index 76% rename from src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/conditions/menu-alias.condition.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/menu/conditions/menu-alias.condition.ts index 5d08fb2b73..b3f01641aa 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/conditions/menu-alias.condition.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/menu/conditions/menu-alias.condition.ts @@ -1,17 +1,13 @@ -import { UMB_MENU_CONTEXT } from '../../menu/components/menu/menu.context.js'; -import { UmbConditionBase } from './condition-base.controller.js'; +import { UMB_MENU_CONTEXT } from '../components/menu/menu.context.js'; +import { UmbConditionBase } from '../../extension-registry/conditions/condition-base.controller.js'; +import type { MenuAliasConditionConfig } from './types.js'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import type { ManifestCondition, - UmbConditionConfigBase, UmbConditionControllerArguments, UmbExtensionCondition, } from '@umbraco-cms/backoffice/extension-api'; -export type MenuAliasConditionConfig = UmbConditionConfigBase & { - match: string; -}; - export class UmbMenuAliasCondition extends UmbConditionBase implements UmbExtensionCondition { constructor(host: UmbControllerHost, args: UmbConditionControllerArguments) { super(host, args); diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/menu/conditions/types.ts b/src/Umbraco.Web.UI.Client/src/packages/core/menu/conditions/types.ts new file mode 100644 index 0000000000..b2d40d3bdb --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/core/menu/conditions/types.ts @@ -0,0 +1,5 @@ +import type { UmbConditionConfigBase } from '@umbraco-cms/backoffice/extension-api'; + +export type MenuAliasConditionConfig = UmbConditionConfigBase & { + match: string; +}; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/menu/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/menu/manifests.ts index 88cfb7bd3d..902c1fe47a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/menu/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/menu/manifests.ts @@ -1,4 +1,4 @@ import { manifests as menuItemManifests } from './components/menu-item/manifests.js'; -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import { manifest as menuAliasConditionManifest } from './conditions/menu-alias.condition.js'; -export const manifests: Array = [...menuItemManifests]; +export const manifests: Array = [...menuItemManifests, menuAliasConditionManifest]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/menu/types.ts b/src/Umbraco.Web.UI.Client/src/packages/core/menu/types.ts index 65e0eacd70..32ef22c9d1 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/menu/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/menu/types.ts @@ -1,4 +1,5 @@ import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity'; +export type * from './conditions/types.js'; // eslint-disable-next-line @typescript-eslint/no-empty-object-type export interface UmbStructureItemModelBase extends UmbEntityModel {} 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 c7ad6fc056..2db690f7de 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 @@ -12,7 +12,6 @@ import { UmbExtensionsManifestInitializer, createExtensionElement } from '@umbra 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 @customElement('umb-section-main-views') export class UmbSectionMainViewElement extends UmbLitElement { @property({ type: String, attribute: 'section-alias' }) @@ -48,12 +47,12 @@ export class UmbSectionMainViewElement extends UmbLitElement { } #constructDashboardPath(manifest: ManifestDashboard) { - const dashboardName = manifest.meta.label ?? manifest.name; + const dashboardName = manifest.meta.label ?? manifest.name ?? manifest.alias; return 'dashboard/' + (manifest.meta.pathname ? manifest.meta.pathname : pathFolderName(dashboardName)); } #constructViewPath(manifest: ManifestSectionView) { - const viewName = manifest.meta.label ?? manifest.name; + const viewName = manifest.meta.label ?? manifest.name ?? manifest.alias; return 'view/' + (manifest.meta.pathname ? manifest.meta.pathname : pathFolderName(viewName)); } @@ -119,7 +118,9 @@ export class UmbSectionMainViewElement extends UmbLitElement { return html` `; })} @@ -134,7 +135,7 @@ export class UmbSectionMainViewElement extends UmbLitElement { ? html` ${this._views.map((view) => { - const viewName = view.meta.label ? this.localize.string(view.meta.label) : view.name; + const viewName = view.meta.label ? this.localize.string(view.meta.label) : (view.name ?? view.alias); const viewPath = this.#constructViewPath(view); return html` Date: Fri, 13 Sep 2024 17:07:40 +0200 Subject: [PATCH 42/43] rename to UmbExtensionManifestKind and deprecate old --- .../collection/action/collection-action-button.element.ts | 4 ++-- .../core/collection/default/collection-default.element.ts | 4 ++-- .../components/header-app/header-app-button.element.ts | 7 ++----- .../core/content-type/workspace/views/design/manifest.ts | 4 ++-- .../core/content/workspace/views/edit/manifests.ts | 4 ++-- .../core/entity-action/common/delete/delete.action.kind.ts | 4 ++-- .../common/duplicate/duplicate.action.kind.ts | 4 ++-- .../core/entity-action/common/duplicate/manifests.ts | 4 ++-- .../core/entity-action/default/default.action.kind.ts | 4 ++-- .../src/packages/core/entity-action/default/manifests.ts | 4 ++-- .../src/packages/core/entity-action/manifests.ts | 4 ++-- .../common/duplicate-to/duplicate-to.action.kind.ts | 4 ++-- .../entity-bulk-action/common/duplicate-to/manifests.ts | 4 ++-- .../core/entity-bulk-action/common/move-to/manifests.ts | 4 ++-- .../common/move-to/move-to.action.kind.ts | 4 ++-- .../core/entity-bulk-action/common/trash/manifests.ts | 4 ++-- .../entity-bulk-action/common/trash/trash.action.kind.ts | 4 ++-- .../core/entity-bulk-action/default/default.action.kind.ts | 4 ++-- .../packages/core/entity-bulk-action/default/manifests.ts | 4 ++-- .../src/packages/core/entity-bulk-action/manifests.ts | 4 ++-- .../src/packages/core/extension-registry/registry.ts | 7 ++++++- src/Umbraco.Web.UI.Client/src/packages/core/manifests.ts | 4 ++-- .../core/menu/components/menu-item/link/manifests.ts | 4 +++- .../src/packages/core/picker/manifests.ts | 4 ++-- .../src/packages/core/picker/search/manifests.ts | 4 ++-- .../core/picker/search/result-item/default/manifests.ts | 4 ++-- .../packages/core/picker/search/result-item/manifests.ts | 4 ++-- .../property-action/default/default.action.kind.ts | 4 ++-- .../components/property-action/default/manifests.ts | 4 ++-- .../components/property-action/manifests.ts | 4 ++-- .../src/packages/core/property-action/manifests.ts | 4 ++-- .../empty-recycle-bin/empty-recycle-bin.action.kind.ts | 4 ++-- .../entity-action/empty-recycle-bin/manifests.ts | 4 ++-- .../entity-action/restore-from-recycle-bin/manifests.ts | 4 ++-- .../restore-from-recycle-bin.action.kind.ts | 4 ++-- .../core/recycle-bin/entity-action/trash/manifests.ts | 4 ++-- .../recycle-bin/entity-action/trash/trash.action.kind.ts | 4 ++-- .../src/packages/core/recycle-bin/manifests.ts | 4 ++-- .../section-sidebar-menu-with-entity-actions.element.ts | 4 ++-- .../section-sidebar-menu/section-sidebar-menu.element.ts | 4 ++-- .../src/packages/core/server-file-system/manifests.ts | 4 ++-- .../packages/core/server-file-system/rename/manifests.ts | 7 ++----- .../rename/rename-server-file.action.kind.ts | 4 ++-- .../src/packages/core/tree/default/manifests.ts | 6 +++--- .../duplicate-to/duplicate-to.action.kind.ts | 4 ++-- .../core/tree/entity-actions/move/move-to.action.kind.ts | 4 ++-- .../entity-actions/reload-tree-item-children/manifests.ts | 4 ++-- .../reload-tree-item-children.action.kind.ts | 4 ++-- .../sort-children-of/sort-children-of.action.kind.ts | 4 ++-- .../create-folder/create-folder.action.kind.ts | 4 ++-- .../delete-folder/delete-folder.action.kind.ts | 4 ++-- .../packages/core/tree/folder/entity-action/manifests.ts | 4 ++-- .../update-folder/update-folder.action.kind.ts | 4 ++-- .../src/packages/core/tree/folder/manifests.ts | 7 ++----- .../src/packages/core/tree/manifests.ts | 4 ++-- .../core/tree/tree-item/tree-item-default/manifests.ts | 6 +++--- .../tree-menu-item-default.element.ts | 4 ++-- .../src/packages/core/workspace/components/manifests.ts | 4 ++-- .../default/default.action.kind.ts | 4 ++-- .../workspace-action-menu-item/default/manifests.ts | 4 ++-- .../components/workspace-action-menu-item/manifests.ts | 4 ++-- .../workspace-action/default/default.action.kind.ts | 4 ++-- .../components/workspace-action/default/manifests.ts | 4 ++-- .../workspace/components/workspace-action/manifests.ts | 4 ++-- .../workspace/components/workspace-breadcrumb/manifests.ts | 4 ++-- .../workspace-menu-breadcrumb.kind.ts | 4 ++-- .../workspace-variant-menu-breadcrumb.kind.ts | 4 ++-- .../workspace/components/workspace-collection/manifests.ts | 4 ++-- .../src/packages/core/workspace/kinds/manifests.ts | 4 ++-- .../workspace/kinds/routable/routable-workspace.kind.ts | 4 ++-- .../src/packages/core/workspace/manifests.ts | 4 ++-- .../src/packages/documents/documents/manifests.ts | 4 ++-- .../src/packages/documents/documents/picker/manifests.ts | 4 ++-- .../src/packages/documents/manifests.ts | 4 ++-- .../src/packages/help/header-app/manifests.ts | 4 ++-- src/Umbraco.Web.UI.Client/src/packages/help/manifests.ts | 4 ++-- .../src/packages/help/menu/manifests.ts | 4 ++-- .../src/packages/members/manifests.ts | 4 ++-- .../src/packages/members/member/manifests.ts | 4 ++-- .../src/packages/members/member/picker/manifests.ts | 4 ++-- .../src/packages/settings/manifests.ts | 4 ++-- .../src/packages/settings/section/manifests.ts | 4 ++-- .../src/packages/settings/structure/manifests.ts | 4 ++-- .../src/packages/settings/welcome/manifests.ts | 4 ++-- .../src/packages/user/change-password/manifests.ts | 4 ++-- .../src/packages/user/current-user/action/default.kind.ts | 4 ++-- .../src/packages/user/section/manifests.ts | 4 ++-- .../src/packages/user/section/sidebar-app/manifests.ts | 4 ++-- .../src/packages/user/user-group/manifests.ts | 4 ++-- .../src/packages/user/user-group/workspace/manifests.ts | 4 ++-- .../user/user-group/workspace/user-group-root/manifests.ts | 4 ++-- .../user/user/client-credential/create/manifests.ts | 4 ++-- .../user/user/client-credential/create/modal/manifests.ts | 4 ++-- .../src/packages/user/user/client-credential/manifests.ts | 4 ++-- .../user/user/client-credential/repository/manifests.ts | 4 ++-- .../packages/user/user/entity-actions/create/manifests.ts | 4 ++-- .../user/user/entity-actions/create/modal/manifests.ts | 4 ++-- .../src/packages/user/user/entity-actions/manifests.ts | 4 ++-- .../user/user/invite/entity-action/invite/manifests.ts | 4 ++-- .../packages/user/user/invite/entity-action/manifests.ts | 4 ++-- .../src/packages/user/user/invite/manifests.ts | 4 ++-- .../src/packages/user/user/manifests.ts | 4 ++-- .../src/packages/user/user/workspace/manifests.ts | 4 ++-- .../packages/user/user/workspace/user-root/manifests.ts | 4 ++-- 104 files changed, 215 insertions(+), 217 deletions(-) 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 b69102308f..8f9e0421a0 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 @@ -4,11 +4,11 @@ import { html, customElement, property, state, ifDefined } from '@umbraco-cms/ba import type { UUIButtonState } from '@umbraco-cms/backoffice/external/uui'; import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; -import type { UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; import type { ManifestCollectionAction } from '@umbraco-cms/backoffice/collection'; import { createExtensionApi } from '@umbraco-cms/backoffice/extension-api'; -const manifest: UmbBackofficeManifestKind = { +const manifest: UmbExtensionManifestKind = { type: 'kind', alias: 'Umb.Kind.CollectionAction.Button', matchKind: 'button', 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 2800f998b2..3b279f33be 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 @@ -4,10 +4,10 @@ import { css, html, customElement, state } from '@umbraco-cms/backoffice/externa import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; -import type { UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; import type { UmbRoute } from '@umbraco-cms/backoffice/router'; -const manifest: UmbBackofficeManifestKind = { +const manifest: UmbExtensionManifestKind = { type: 'kind', alias: 'Umb.Kind.Collection.Default', matchKind: 'default', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/header-app/header-app-button.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/header-app/header-app-button.element.ts index 6e77996918..86cb881ca8 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/components/header-app/header-app-button.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/header-app/header-app-button.element.ts @@ -1,14 +1,11 @@ import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import type { CSSResultGroup } from '@umbraco-cms/backoffice/external/lit'; import { css, html, customElement, ifDefined } from '@umbraco-cms/backoffice/external/lit'; -import type { - ManifestHeaderAppButtonKind, - UmbBackofficeManifestKind, -} from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestHeaderAppButtonKind, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; -const manifest: UmbBackofficeManifestKind = { +const manifest: UmbExtensionManifestKind = { type: 'kind', alias: 'Umb.Kind.Button', matchKind: 'button', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/workspace/views/design/manifest.ts b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/workspace/views/design/manifest.ts index 86a9442024..41b28a6efb 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/workspace/views/design/manifest.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/workspace/views/design/manifest.ts @@ -1,6 +1,6 @@ -import type { UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const contentTypeDesignEditorManifest: UmbBackofficeManifestKind = { +export const contentTypeDesignEditorManifest: UmbExtensionManifestKind = { type: 'kind', alias: 'Umb.Kind.WorkspaceView.ContentTypeDesignEditor', matchKind: 'contentTypeDesignEditor', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/content/workspace/views/edit/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/content/workspace/views/edit/manifests.ts index caa2ec28d8..cc227ab2f7 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/content/workspace/views/edit/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/content/workspace/views/edit/manifests.ts @@ -1,7 +1,7 @@ import { manifests as conditionsManifests } from './conditions/manifests.js'; -import type { UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -const contentEditorManifest: UmbBackofficeManifestKind = { +const contentEditorManifest: UmbExtensionManifestKind = { type: 'kind', alias: 'Umb.Kind.WorkspaceView.ContentEditor', matchKind: 'contentEditor', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/delete/delete.action.kind.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/delete/delete.action.kind.ts index 12fb21ad02..a6a031522e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/delete/delete.action.kind.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/delete/delete.action.kind.ts @@ -1,7 +1,7 @@ import { UMB_ENTITY_ACTION_DEFAULT_KIND_MANIFEST } from '../../default/default.action.kind.js'; -import type { UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifest: UmbBackofficeManifestKind = { +export const manifest: UmbExtensionManifestKind = { type: 'kind', alias: 'Umb.Kind.EntityAction.Delete', matchKind: 'delete', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/duplicate/duplicate.action.kind.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/duplicate/duplicate.action.kind.ts index 0c5fdc11ca..375686b7fe 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/duplicate/duplicate.action.kind.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/duplicate/duplicate.action.kind.ts @@ -1,7 +1,7 @@ import { UMB_ENTITY_ACTION_DEFAULT_KIND_MANIFEST } from '../../default/default.action.kind.js'; -import type { UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifest: UmbBackofficeManifestKind = { +export const manifest: UmbExtensionManifestKind = { type: 'kind', alias: 'Umb.Kind.EntityAction.Duplicate', matchKind: 'duplicate', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/duplicate/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/duplicate/manifests.ts index 33f1e8086a..6ba214f4d7 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/duplicate/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/duplicate/manifests.ts @@ -1,4 +1,4 @@ import { manifest as duplicateKindManifest } from './duplicate.action.kind.js'; -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [duplicateKindManifest]; +export const manifests: Array = [duplicateKindManifest]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/default/default.action.kind.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/default/default.action.kind.ts index b75aec9476..5a6419fb6a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/default/default.action.kind.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/default/default.action.kind.ts @@ -1,6 +1,6 @@ -import type { UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const UMB_ENTITY_ACTION_DEFAULT_KIND_MANIFEST: UmbBackofficeManifestKind = { +export const UMB_ENTITY_ACTION_DEFAULT_KIND_MANIFEST: UmbExtensionManifestKind = { type: 'kind', alias: 'Umb.Kind.EntityAction.Default', matchKind: 'default', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/default/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/default/manifests.ts index 3cb64a6f47..1f4204492a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/default/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/default/manifests.ts @@ -1,4 +1,4 @@ import { manifest as defaultKindManifest } from './default.action.kind.js'; -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [defaultKindManifest]; +export const manifests: Array = [defaultKindManifest]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/manifests.ts index 3deded0b21..0cc2292022 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/manifests.ts @@ -1,9 +1,9 @@ import { manifests as defaultEntityActionManifests } from './default/manifests.js'; import { manifests as deleteEntityActionManifests } from './common/delete/manifests.js'; import { manifests as duplicateEntityActionManifests } from './common/duplicate/manifests.js'; -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [ +export const manifests: Array = [ ...defaultEntityActionManifests, ...deleteEntityActionManifests, ...duplicateEntityActionManifests, diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/common/duplicate-to/duplicate-to.action.kind.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/common/duplicate-to/duplicate-to.action.kind.ts index 0a2d16168d..f5b5d40026 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/common/duplicate-to/duplicate-to.action.kind.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/common/duplicate-to/duplicate-to.action.kind.ts @@ -1,7 +1,7 @@ import { UMB_ENTITY_BULK_ACTION_DEFAULT_KIND_MANIFEST } from '../../default/default.action.kind.js'; -import type { UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifest: UmbBackofficeManifestKind = { +export const manifest: UmbExtensionManifestKind = { type: 'kind', alias: 'Umb.Kind.EntityBulkAction.DuplicateTo', matchKind: 'duplicateTo', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/common/duplicate-to/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/common/duplicate-to/manifests.ts index 8f6bf64f0e..217332aec8 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/common/duplicate-to/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/common/duplicate-to/manifests.ts @@ -1,4 +1,4 @@ import { manifest as duplicateToKindManifest } from './duplicate-to.action.kind.js'; -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [duplicateToKindManifest]; +export const manifests: Array = [duplicateToKindManifest]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/common/move-to/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/common/move-to/manifests.ts index 701878051e..4007c84f1c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/common/move-to/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/common/move-to/manifests.ts @@ -1,4 +1,4 @@ import { manifest as moveToKindManifest } from './move-to.action.kind.js'; -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [moveToKindManifest]; +export const manifests: Array = [moveToKindManifest]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/common/move-to/move-to.action.kind.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/common/move-to/move-to.action.kind.ts index a26a2d7302..ccc6d49212 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/common/move-to/move-to.action.kind.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/common/move-to/move-to.action.kind.ts @@ -1,7 +1,7 @@ import { UMB_ENTITY_BULK_ACTION_DEFAULT_KIND_MANIFEST } from '../../default/default.action.kind.js'; -import type { UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifest: UmbBackofficeManifestKind = { +export const manifest: UmbExtensionManifestKind = { type: 'kind', alias: 'Umb.Kind.EntityBulkAction.MoveTo', matchKind: 'moveTo', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/common/trash/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/common/trash/manifests.ts index f48d4f6879..bca8d22490 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/common/trash/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/common/trash/manifests.ts @@ -1,4 +1,4 @@ import { manifest as trashKindManifest } from './trash.action.kind.js'; -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [trashKindManifest]; +export const manifests: Array = [trashKindManifest]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/common/trash/trash.action.kind.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/common/trash/trash.action.kind.ts index 5cec1325a1..2c36d6dc35 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/common/trash/trash.action.kind.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/common/trash/trash.action.kind.ts @@ -1,7 +1,7 @@ import { UMB_ENTITY_BULK_ACTION_DEFAULT_KIND_MANIFEST } from '../../default/default.action.kind.js'; -import type { UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifest: UmbBackofficeManifestKind = { +export const manifest: UmbExtensionManifestKind = { type: 'kind', alias: 'Umb.Kind.EntityBulkAction.Trash', matchKind: 'trash', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/default/default.action.kind.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/default/default.action.kind.ts index 2b13205e93..c7605b0d64 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/default/default.action.kind.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/default/default.action.kind.ts @@ -1,6 +1,6 @@ -import type { UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const UMB_ENTITY_BULK_ACTION_DEFAULT_KIND_MANIFEST: UmbBackofficeManifestKind = { +export const UMB_ENTITY_BULK_ACTION_DEFAULT_KIND_MANIFEST: UmbExtensionManifestKind = { type: 'kind', alias: 'Umb.Kind.EntityBulkAction.Default', matchKind: 'default', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/default/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/default/manifests.ts index 3cb64a6f47..1f4204492a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/default/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/default/manifests.ts @@ -1,4 +1,4 @@ import { manifest as defaultKindManifest } from './default.action.kind.js'; -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [defaultKindManifest]; +export const manifests: Array = [defaultKindManifest]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/manifests.ts index 306185ef77..1db227921a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/manifests.ts @@ -2,9 +2,9 @@ import { manifests as defaultEntityBulkActionManifests } from './default/manifes import { manifests as duplicateEntityBulkActionManifests } from './common/duplicate-to/manifests.js'; import { manifests as moveToEntityBulkActionManifests } from './common/move-to/manifests.js'; import { manifests as trashEntityBulkActionManifests } from './common/trash/manifests.js'; -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [ +export const manifests: Array = [ ...defaultEntityBulkActionManifests, ...duplicateEntityBulkActionManifests, ...moveToEntityBulkActionManifests, diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/registry.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/registry.ts index 649d77294a..0985b3226e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/registry.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/registry.ts @@ -1,7 +1,12 @@ import type { ManifestKind } from '@umbraco-cms/backoffice/extension-api'; import { UmbExtensionRegistry } from '@umbraco-cms/backoffice/extension-api'; -export type UmbBackofficeManifestKind = ManifestKind; +export type UmbExtensionManifestKind = ManifestKind; export type UmbBackofficeExtensionRegistry = UmbExtensionRegistry; export const umbExtensionsRegistry = new UmbExtensionRegistry() as UmbBackofficeExtensionRegistry; + +/** + * @deprecated Use `UmbExtensionManifestKind` instead. + */ +export type UmbBackofficeManifestKind = ManifestKind; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/manifests.ts index 5fc8f5c5a8..d70f17bca8 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/manifests.ts @@ -22,9 +22,9 @@ import { manifests as themeManifests } from './themes/manifests.js'; import { manifests as treeManifests } from './tree/manifests.js'; import { manifests as workspaceManifests } from './workspace/manifests.js'; -import type { ManifestTypes, UmbBackofficeManifestKind } from './extension-registry/index.js'; +import type { ManifestTypes, UmbExtensionManifestKind } from './extension-registry/index.js'; -export const manifests: Array = [ +export const manifests: Array = [ ...authManifests, ...collectionManifests, ...contentManifests, diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/menu/components/menu-item/link/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/menu/components/menu-item/link/manifests.ts index 5437c69989..c4c67d7f93 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/menu/components/menu-item/link/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/menu/components/menu-item/link/manifests.ts @@ -1,4 +1,6 @@ -export const manifests: Array = [ +import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; + +export const manifests: Array = [ { type: 'kind', alias: 'Umb.Kind.MenuItem.Link', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/picker/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/picker/manifests.ts index 7504bc1bc5..4e216d557a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/picker/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/picker/manifests.ts @@ -1,4 +1,4 @@ import { manifests as searchManifests } from './search/manifests.js'; -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [...searchManifests]; +export const manifests: Array = [...searchManifests]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/picker/search/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/picker/search/manifests.ts index 2a13be78ab..b75f6a7d58 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/picker/search/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/picker/search/manifests.ts @@ -1,4 +1,4 @@ import { manifests as resultItemManifests } from './result-item/manifests.js'; -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [...resultItemManifests]; +export const manifests: Array = [...resultItemManifests]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/picker/search/result-item/default/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/picker/search/result-item/default/manifests.ts index 12711bdae6..1629b373d0 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/picker/search/result-item/default/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/picker/search/result-item/default/manifests.ts @@ -1,6 +1,6 @@ -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [ +export const manifests: Array = [ { type: 'kind', alias: 'Umb.Kind.PickerSearchResultItem.Default', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/picker/search/result-item/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/picker/search/result-item/manifests.ts index 98e3dac659..1a025e9d3c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/picker/search/result-item/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/picker/search/result-item/manifests.ts @@ -1,4 +1,4 @@ import { manifests as defaultManifests } from './default/manifests.js'; -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [...defaultManifests]; +export const manifests: Array = [...defaultManifests]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-action/components/property-action/default/default.action.kind.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-action/components/property-action/default/default.action.kind.ts index fdc53a61a0..16664f5a3a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-action/components/property-action/default/default.action.kind.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-action/components/property-action/default/default.action.kind.ts @@ -1,6 +1,6 @@ -import type { UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifest: UmbBackofficeManifestKind = { +export const manifest: UmbExtensionManifestKind = { type: 'kind', alias: 'Umb.Kind.PropertyAction.Default', matchKind: 'default', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-action/components/property-action/default/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-action/components/property-action/default/manifests.ts index 3cb64a6f47..1f4204492a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-action/components/property-action/default/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-action/components/property-action/default/manifests.ts @@ -1,4 +1,4 @@ import { manifest as defaultKindManifest } from './default.action.kind.js'; -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [defaultKindManifest]; +export const manifests: Array = [defaultKindManifest]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-action/components/property-action/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-action/components/property-action/manifests.ts index 58ab7db446..fa07cbfb41 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-action/components/property-action/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-action/components/property-action/manifests.ts @@ -1,4 +1,4 @@ import { manifests as defaultWorkspaceActionManifests } from './default/manifests.js'; -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [...defaultWorkspaceActionManifests]; +export const manifests: Array = [...defaultWorkspaceActionManifests]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-action/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-action/manifests.ts index bca10e1652..ab87e1d203 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-action/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-action/manifests.ts @@ -2,7 +2,7 @@ import { manifests as defaultManifests } from './components/property-action/mani import type { ManifestPropertyActions, ManifestTypes, - UmbBackofficeManifestKind, + UmbExtensionManifestKind, } from '@umbraco-cms/backoffice/extension-registry'; import { UMB_WRITABLE_PROPERTY_CONDITION_ALIAS } from '@umbraco-cms/backoffice/property'; @@ -44,7 +44,7 @@ export const propertyActionManifests: Array = [ }, ]; -export const manifests: Array = [ +export const manifests: Array = [ ...defaultManifests, ...propertyActionManifests, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/entity-action/empty-recycle-bin/empty-recycle-bin.action.kind.ts b/src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/entity-action/empty-recycle-bin/empty-recycle-bin.action.kind.ts index de15a8826a..b37f500241 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/entity-action/empty-recycle-bin/empty-recycle-bin.action.kind.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/entity-action/empty-recycle-bin/empty-recycle-bin.action.kind.ts @@ -1,7 +1,7 @@ import { UMB_ENTITY_ACTION_DEFAULT_KIND_MANIFEST } from '../../../entity-action/default/default.action.kind.js'; -import type { UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifest: UmbBackofficeManifestKind = { +export const manifest: UmbExtensionManifestKind = { type: 'kind', alias: 'Umb.Kind.EntityAction.RecycleBin.Empty', matchKind: 'emptyRecycleBin', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/entity-action/empty-recycle-bin/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/entity-action/empty-recycle-bin/manifests.ts index c6618e9347..a7ae3bc230 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/entity-action/empty-recycle-bin/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/entity-action/empty-recycle-bin/manifests.ts @@ -1,4 +1,4 @@ import { manifest as emptyRecycleBinKindManifest } from './empty-recycle-bin.action.kind.js'; -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [emptyRecycleBinKindManifest]; +export const manifests: Array = [emptyRecycleBinKindManifest]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/entity-action/restore-from-recycle-bin/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/entity-action/restore-from-recycle-bin/manifests.ts index 23255c81a8..fc62ba1be1 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/entity-action/restore-from-recycle-bin/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/entity-action/restore-from-recycle-bin/manifests.ts @@ -1,7 +1,7 @@ import { manifest as kindManifest } from './restore-from-recycle-bin.action.kind.js'; -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [ +export const manifests: Array = [ kindManifest, { type: 'modal', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/entity-action/restore-from-recycle-bin/restore-from-recycle-bin.action.kind.ts b/src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/entity-action/restore-from-recycle-bin/restore-from-recycle-bin.action.kind.ts index 18edd68da0..c10f56989e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/entity-action/restore-from-recycle-bin/restore-from-recycle-bin.action.kind.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/entity-action/restore-from-recycle-bin/restore-from-recycle-bin.action.kind.ts @@ -1,7 +1,7 @@ import { UMB_ENTITY_ACTION_DEFAULT_KIND_MANIFEST } from '../../../entity-action/default/default.action.kind.js'; -import type { UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifest: UmbBackofficeManifestKind = { +export const manifest: UmbExtensionManifestKind = { type: 'kind', alias: 'Umb.Kind.EntityAction.RecycleBin.Restore', matchKind: 'restoreFromRecycleBin', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/entity-action/trash/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/entity-action/trash/manifests.ts index f48d4f6879..bca8d22490 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/entity-action/trash/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/entity-action/trash/manifests.ts @@ -1,4 +1,4 @@ import { manifest as trashKindManifest } from './trash.action.kind.js'; -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [trashKindManifest]; +export const manifests: Array = [trashKindManifest]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/entity-action/trash/trash.action.kind.ts b/src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/entity-action/trash/trash.action.kind.ts index 32aac57159..b68385c174 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/entity-action/trash/trash.action.kind.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/entity-action/trash/trash.action.kind.ts @@ -1,7 +1,7 @@ import { UMB_ENTITY_ACTION_DEFAULT_KIND_MANIFEST } from '../../../entity-action/default/default.action.kind.js'; -import type { UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifest: UmbBackofficeManifestKind = { +export const manifest: UmbExtensionManifestKind = { type: 'kind', alias: 'Umb.Kind.EntityAction.Trash', matchKind: 'trash', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/manifests.ts index 1a0c4526d0..364058c11b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/manifests.ts @@ -2,9 +2,9 @@ import { manifests as trashEntityActionManifests } from './entity-action/trash/m import { manifests as restoreFromRecycleBinEntityActionManifests } from './entity-action/restore-from-recycle-bin/manifests.js'; import { manifests as emptyRecycleBinEntityActionManifests } from './entity-action/empty-recycle-bin/manifests.js'; import { manifests as conditionManifests } from './conditions/manifests.js'; -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [ +export const manifests: Array = [ ...conditionManifests, ...emptyRecycleBinEntityActionManifests, ...restoreFromRecycleBinEntityActionManifests, diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/section/section-sidebar-menu-with-entity-actions/section-sidebar-menu-with-entity-actions.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/section/section-sidebar-menu-with-entity-actions/section-sidebar-menu-with-entity-actions.element.ts index f44e5da409..ff659a7411 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/section/section-sidebar-menu-with-entity-actions/section-sidebar-menu-with-entity-actions.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/section/section-sidebar-menu-with-entity-actions/section-sidebar-menu-with-entity-actions.element.ts @@ -2,11 +2,11 @@ import { UmbSectionSidebarMenuElement } from '../section-sidebar-menu/section-si import { css, html, customElement } from '@umbraco-cms/backoffice/external/lit'; import type { ManifestSectionSidebarAppMenuWithEntityActionsKind, - UmbBackofficeManifestKind, + UmbExtensionManifestKind, } from '@umbraco-cms/backoffice/extension-registry'; import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; -const manifestWithEntityActions: UmbBackofficeManifestKind = { +const manifestWithEntityActions: UmbExtensionManifestKind = { type: 'kind', alias: 'Umb.Kind.SectionSidebarAppMenuWithEntityActions', matchKind: 'menuWithEntityActions', 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 4f84d80985..e7dff9272b 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,13 +4,13 @@ import type { ManifestMenu, ManifestSectionSidebarAppBaseMenu, ManifestSectionSidebarAppMenuKind, - UmbBackofficeManifestKind, + UmbExtensionManifestKind, } from '@umbraco-cms/backoffice/extension-registry'; import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; // TODO: Move to separate file: -const manifest: UmbBackofficeManifestKind = { +const manifest: UmbExtensionManifestKind = { type: 'kind', alias: 'Umb.Kind.SectionSidebarAppMenu', matchKind: 'menu', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/server-file-system/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/server-file-system/manifests.ts index c7b83c28c2..b456324e34 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/server-file-system/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/server-file-system/manifests.ts @@ -1,4 +1,4 @@ import { manifests as renameEntityActionManifests } from '../server-file-system/rename/manifests.js'; -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [...renameEntityActionManifests]; +export const manifests: Array = [...renameEntityActionManifests]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/server-file-system/rename/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/server-file-system/rename/manifests.ts index f4131c023b..8f920286d6 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/server-file-system/rename/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/server-file-system/rename/manifests.ts @@ -1,8 +1,5 @@ import { manifests as renameModalManifests } from './modal/manifests.js'; import { manifest as renameKindManifest } from './rename-server-file.action.kind.js'; -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [ - ...renameModalManifests, - renameKindManifest, -]; +export const manifests: Array = [...renameModalManifests, renameKindManifest]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/server-file-system/rename/rename-server-file.action.kind.ts b/src/Umbraco.Web.UI.Client/src/packages/core/server-file-system/rename/rename-server-file.action.kind.ts index f54bb2417c..c151e755fc 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/server-file-system/rename/rename-server-file.action.kind.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/server-file-system/rename/rename-server-file.action.kind.ts @@ -1,7 +1,7 @@ import { UMB_ENTITY_ACTION_DEFAULT_KIND_MANIFEST } from '../../entity-action/default/default.action.kind.js'; -import type { UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifest: UmbBackofficeManifestKind = { +export const manifest: UmbExtensionManifestKind = { type: 'kind', alias: 'Umb.Kind.EntityAction.ServerFile.Rename', matchKind: 'renameServerFile', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/default/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/default/manifests.ts index b82cb80c62..bff3a39b08 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/default/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/default/manifests.ts @@ -1,6 +1,6 @@ -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -const defaultTreeKind: UmbBackofficeManifestKind = { +const defaultTreeKind: UmbExtensionManifestKind = { type: 'kind', alias: 'Umb.Kind.Tree.Default', matchKind: 'default', @@ -12,4 +12,4 @@ const defaultTreeKind: UmbBackofficeManifestKind = { }, }; -export const manifests: Array = [defaultTreeKind]; +export const manifests: Array = [defaultTreeKind]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/duplicate-to/duplicate-to.action.kind.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/duplicate-to/duplicate-to.action.kind.ts index 7b71b4ecdd..2f41923b1f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/duplicate-to/duplicate-to.action.kind.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/duplicate-to/duplicate-to.action.kind.ts @@ -1,7 +1,7 @@ import { UMB_ENTITY_ACTION_DEFAULT_KIND_MANIFEST } from '@umbraco-cms/backoffice/entity-action'; -import type { UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifest: UmbBackofficeManifestKind = { +export const manifest: UmbExtensionManifestKind = { type: 'kind', alias: 'Umb.Kind.EntityAction.DuplicateTo', matchKind: 'duplicateTo', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/move/move-to.action.kind.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/move/move-to.action.kind.ts index 600edfa84d..429a90a7cf 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/move/move-to.action.kind.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/move/move-to.action.kind.ts @@ -1,7 +1,7 @@ import { UMB_ENTITY_ACTION_DEFAULT_KIND_MANIFEST } from '@umbraco-cms/backoffice/entity-action'; -import type { UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifest: UmbBackofficeManifestKind = { +export const manifest: UmbExtensionManifestKind = { type: 'kind', alias: 'Umb.Kind.EntityAction.MoveTo', matchKind: 'moveTo', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/reload-tree-item-children/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/reload-tree-item-children/manifests.ts index 49838e1b0c..c702133f43 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/reload-tree-item-children/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/reload-tree-item-children/manifests.ts @@ -1,4 +1,4 @@ import { manifest as reloadTreeItemChildrenKind } from './reload-tree-item-children.action.kind.js'; -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [reloadTreeItemChildrenKind]; +export const manifests: Array = [reloadTreeItemChildrenKind]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/reload-tree-item-children/reload-tree-item-children.action.kind.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/reload-tree-item-children/reload-tree-item-children.action.kind.ts index 56906b23a9..d3f8b8e9f2 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/reload-tree-item-children/reload-tree-item-children.action.kind.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/reload-tree-item-children/reload-tree-item-children.action.kind.ts @@ -1,7 +1,7 @@ -import type { UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; import { UMB_ENTITY_ACTION_DEFAULT_KIND_MANIFEST } from '@umbraco-cms/backoffice/entity-action'; -export const manifest: UmbBackofficeManifestKind = { +export const manifest: UmbExtensionManifestKind = { type: 'kind', alias: 'Umb.Kind.EntityAction.Tree.ReloadChildrenOf', matchKind: 'reloadTreeItemChildren', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/sort-children-of/sort-children-of.action.kind.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/sort-children-of/sort-children-of.action.kind.ts index bad57bb155..1559f36e4b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/sort-children-of/sort-children-of.action.kind.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/sort-children-of/sort-children-of.action.kind.ts @@ -1,7 +1,7 @@ import { UMB_ENTITY_ACTION_DEFAULT_KIND_MANIFEST } from '@umbraco-cms/backoffice/entity-action'; -import type { UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifest: UmbBackofficeManifestKind = { +export const manifest: UmbExtensionManifestKind = { type: 'kind', alias: 'Umb.Kind.EntityAction.SortChildrenOf', matchKind: 'sortChildrenOf', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/entity-action/create-folder/create-folder.action.kind.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/entity-action/create-folder/create-folder.action.kind.ts index 6d3ec770bf..8677ce5d9f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/entity-action/create-folder/create-folder.action.kind.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/entity-action/create-folder/create-folder.action.kind.ts @@ -1,8 +1,8 @@ import { UmbCreateFolderEntityAction } from './create-folder.action.js'; -import type { UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; import { UMB_ENTITY_ACTION_DEFAULT_KIND_MANIFEST } from '@umbraco-cms/backoffice/entity-action'; -export const manifest: UmbBackofficeManifestKind = { +export const manifest: UmbExtensionManifestKind = { type: 'kind', alias: 'Umb.Kind.EntityAction.Folder.Create', matchKind: 'folderCreate', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/entity-action/delete-folder/delete-folder.action.kind.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/entity-action/delete-folder/delete-folder.action.kind.ts index 30677f4ba5..ab40bb66a5 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/entity-action/delete-folder/delete-folder.action.kind.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/entity-action/delete-folder/delete-folder.action.kind.ts @@ -1,8 +1,8 @@ import { UmbDeleteFolderEntityAction } from './delete-folder.action.js'; -import type { UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; import { UMB_ENTITY_ACTION_DEFAULT_KIND_MANIFEST } from '@umbraco-cms/backoffice/entity-action'; -export const manifest: UmbBackofficeManifestKind = { +export const manifest: UmbExtensionManifestKind = { type: 'kind', alias: 'Umb.Kind.EntityAction.Folder.Delete', matchKind: 'folderDelete', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/entity-action/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/entity-action/manifests.ts index 6aac6266a6..8bbc5684eb 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/entity-action/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/entity-action/manifests.ts @@ -1,9 +1,9 @@ import { manifest as createKindManifest } from './create-folder/create-folder.action.kind.js'; import { manifest as deleteKindManifest } from './delete-folder/delete-folder.action.kind.js'; import { manifest as updateKindManifest } from './update-folder/update-folder.action.kind.js'; -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [ +export const manifests: Array = [ createKindManifest, deleteKindManifest, updateKindManifest, diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/entity-action/update-folder/update-folder.action.kind.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/entity-action/update-folder/update-folder.action.kind.ts index 39f62fcb10..075d9915e2 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/entity-action/update-folder/update-folder.action.kind.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/entity-action/update-folder/update-folder.action.kind.ts @@ -1,8 +1,8 @@ import { UmbUpdateFolderEntityAction } from './update-folder.action.js'; -import type { UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; import { UMB_ENTITY_ACTION_DEFAULT_KIND_MANIFEST } from '@umbraco-cms/backoffice/entity-action'; -export const manifest: UmbBackofficeManifestKind = { +export const manifest: UmbExtensionManifestKind = { type: 'kind', alias: 'Umb.Kind.EntityAction.Folder.Update', matchKind: 'folderUpdate', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/manifests.ts index fc90ffc72a..78f24e79d7 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/manifests.ts @@ -1,8 +1,5 @@ import { manifests as modalManifests } from './modal/manifests.js'; import { manifests as entityActionManifests } from './entity-action/manifests.js'; -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [ - ...modalManifests, - ...entityActionManifests, -]; +export const manifests: Array = [...modalManifests, ...entityActionManifests]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/manifests.ts index 55aba35023..741112d60e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/manifests.ts @@ -3,9 +3,9 @@ import { manifests as defaultTreeItemManifests } from './tree-item/tree-item-def import { manifests as defaultTreeManifests } from './default/manifests.js'; import { manifests as treePickerManifests } from './tree-picker-modal/manifests.js'; import { manifests as entityActionManifests } from './entity-actions/manifests.js'; -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [ +export const manifests: Array = [ ...defaultTreeItemManifests, ...defaultTreeManifests, ...entityActionManifests, diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item/tree-item-default/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item/tree-item-default/manifests.ts index e48e690f95..dfeb703d55 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item/tree-item-default/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item/tree-item-default/manifests.ts @@ -1,6 +1,6 @@ -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -const kind: UmbBackofficeManifestKind = { +const kind: UmbExtensionManifestKind = { type: 'kind', alias: 'Umb.Kind.TreeItem.Default', matchKind: 'default', @@ -12,4 +12,4 @@ const kind: UmbBackofficeManifestKind = { }, }; -export const manifests: Array = [kind]; +export const manifests: Array = [kind]; 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 d80c5f861b..c7fd51cc5d 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 @@ -2,13 +2,13 @@ import { html, nothing, customElement, property } from '@umbraco-cms/backoffice/ import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { ManifestMenuItemTreeKind, - UmbBackofficeManifestKind, + UmbExtensionManifestKind, UmbMenuItemElement, } from '@umbraco-cms/backoffice/extension-registry'; import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; // TODO: Move to separate file: -const manifest: UmbBackofficeManifestKind = { +const manifest: UmbExtensionManifestKind = { type: 'kind', alias: 'Umb.Kind.Tree', matchKind: 'tree', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/manifests.ts index 0870f24cb0..f0c9e72bc1 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/manifests.ts @@ -2,9 +2,9 @@ import { manifests as workspaceActionManifests } from './workspace-action/manife import { manifests as workspaceActionMenuItemManifests } from './workspace-action-menu-item/manifests.js'; import { manifests as workspaceBreadcrumbManifests } from './workspace-breadcrumb/manifests.js'; import { manifests as workspaceViewManifests } from './workspace-collection/manifests.js'; -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [ +export const manifests: Array = [ ...workspaceActionManifests, ...workspaceActionMenuItemManifests, ...workspaceBreadcrumbManifests, diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action-menu-item/default/default.action.kind.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action-menu-item/default/default.action.kind.ts index 28349aa484..019873d27a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action-menu-item/default/default.action.kind.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action-menu-item/default/default.action.kind.ts @@ -1,6 +1,6 @@ -import type { UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifest: UmbBackofficeManifestKind = { +export const manifest: UmbExtensionManifestKind = { type: 'kind', alias: 'Umb.Kind.WorkspaceActionMenuItem.Default', matchKind: 'default', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action-menu-item/default/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action-menu-item/default/manifests.ts index 3cb64a6f47..1f4204492a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action-menu-item/default/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action-menu-item/default/manifests.ts @@ -1,4 +1,4 @@ import { manifest as defaultKindManifest } from './default.action.kind.js'; -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [defaultKindManifest]; +export const manifests: Array = [defaultKindManifest]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action-menu-item/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action-menu-item/manifests.ts index 58ab7db446..fa07cbfb41 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action-menu-item/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action-menu-item/manifests.ts @@ -1,4 +1,4 @@ import { manifests as defaultWorkspaceActionManifests } from './default/manifests.js'; -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [...defaultWorkspaceActionManifests]; +export const manifests: Array = [...defaultWorkspaceActionManifests]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action/default/default.action.kind.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action/default/default.action.kind.ts index 1187c81413..8b21321659 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action/default/default.action.kind.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action/default/default.action.kind.ts @@ -1,6 +1,6 @@ -import type { UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifest: UmbBackofficeManifestKind = { +export const manifest: UmbExtensionManifestKind = { type: 'kind', alias: 'Umb.Kind.WorkspaceAction.Default', matchKind: 'default', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action/default/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action/default/manifests.ts index 3cb64a6f47..1f4204492a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action/default/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action/default/manifests.ts @@ -1,4 +1,4 @@ import { manifest as defaultKindManifest } from './default.action.kind.js'; -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [defaultKindManifest]; +export const manifests: Array = [defaultKindManifest]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action/manifests.ts index 58ab7db446..fa07cbfb41 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action/manifests.ts @@ -1,4 +1,4 @@ import { manifests as defaultWorkspaceActionManifests } from './default/manifests.js'; -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [...defaultWorkspaceActionManifests]; +export const manifests: Array = [...defaultWorkspaceActionManifests]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-breadcrumb/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-breadcrumb/manifests.ts index a0d8475e76..1dc6f7cceb 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-breadcrumb/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-breadcrumb/manifests.ts @@ -1,8 +1,8 @@ import { manifest as workspaceBreadcrumbKind } from './workspace-menu-breadcrumb/workspace-menu-breadcrumb.kind.js'; import { manifest as variantBreadcrumbKind } from './workspace-variant-menu-breadcrumb/workspace-variant-menu-breadcrumb.kind.js'; -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [ +export const manifests: Array = [ workspaceBreadcrumbKind, variantBreadcrumbKind, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-breadcrumb/workspace-menu-breadcrumb/workspace-menu-breadcrumb.kind.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-breadcrumb/workspace-menu-breadcrumb/workspace-menu-breadcrumb.kind.ts index 32c3475018..674fdc50c6 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-breadcrumb/workspace-menu-breadcrumb/workspace-menu-breadcrumb.kind.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-breadcrumb/workspace-menu-breadcrumb/workspace-menu-breadcrumb.kind.ts @@ -1,6 +1,6 @@ -import type { UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifest: UmbBackofficeManifestKind = { +export const manifest: UmbExtensionManifestKind = { type: 'kind', alias: 'Umb.Kind.WorkspaceFooterApp.MenuBreadcrumb', matchKind: 'menuBreadcrumb', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-breadcrumb/workspace-variant-menu-breadcrumb/workspace-variant-menu-breadcrumb.kind.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-breadcrumb/workspace-variant-menu-breadcrumb/workspace-variant-menu-breadcrumb.kind.ts index 6c37392e39..74def3cd1c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-breadcrumb/workspace-variant-menu-breadcrumb/workspace-variant-menu-breadcrumb.kind.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-breadcrumb/workspace-variant-menu-breadcrumb/workspace-variant-menu-breadcrumb.kind.ts @@ -1,6 +1,6 @@ -import type { UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifest: UmbBackofficeManifestKind = { +export const manifest: UmbExtensionManifestKind = { type: 'kind', alias: 'Umb.Kind.WorkspaceFooterApp.VariantMenuBreadcrumb', matchKind: 'variantMenuBreadcrumb', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-collection/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-collection/manifests.ts index f2795cd8fb..19ec7fb94b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-collection/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-collection/manifests.ts @@ -1,6 +1,6 @@ -import type { UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [ +export const manifests: Array = [ { type: 'kind', alias: 'Umb.Kind.WorkspaceView.Collection', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/kinds/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/kinds/manifests.ts index 380b26b726..3d01d1f902 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/kinds/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/kinds/manifests.ts @@ -1,4 +1,4 @@ import { manifest as routableKindManifest } from './routable/routable-workspace.kind.js'; -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [routableKindManifest]; +export const manifests: Array = [routableKindManifest]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/kinds/routable/routable-workspace.kind.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/kinds/routable/routable-workspace.kind.ts index 68840c0a51..3bce4d4c7f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/kinds/routable/routable-workspace.kind.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/kinds/routable/routable-workspace.kind.ts @@ -1,6 +1,6 @@ -import type { UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifest: UmbBackofficeManifestKind = { +export const manifest: UmbExtensionManifestKind = { type: 'kind', alias: 'Umb.Kind.Workspace.Routable', matchKind: 'routable', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/manifests.ts index 7e64360c26..bc9c22e109 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/manifests.ts @@ -3,9 +3,9 @@ import { manifests as sectionRouteManifests } from './section-routes/manifests.j import { manifests as workspaceConditionManifests } from './conditions/manifests.js'; import { manifests as workspaceKindManifest } from './kinds/manifests.js'; import { manifests as workspaceModalManifest } from './modals/manifests.js'; -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [ +export const manifests: Array = [ ...componentManifests, ...sectionRouteManifests, ...workspaceConditionManifests, diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/manifests.ts index 3fb3e70336..eda4e4564c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/manifests.ts @@ -14,9 +14,9 @@ import { manifests as treeManifests } from './tree/manifests.js'; import { manifests as userPermissionManifests } from './user-permissions/manifests.js'; import { manifests as workspaceManifests } from './workspace/manifests.js'; -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [ +export const manifests: Array = [ ...collectionManifests, ...entityActionManifests, ...entityBulkActionManifests, diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/picker/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/picker/manifests.ts index f718ec4796..3bd55a6bdc 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/picker/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/picker/manifests.ts @@ -1,7 +1,7 @@ import { UMB_DOCUMENT_ENTITY_TYPE } from '../entity.js'; -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [ +export const manifests: Array = [ { type: 'pickerSearchResultItem', kind: 'default', diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/manifests.ts index e9d9a3d2ea..94ed00a783 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/manifests.ts @@ -3,9 +3,9 @@ import { manifests as documentBlueprintManifests } from './document-blueprints/m import { manifests as documentManifests } from './documents/manifests.js'; import { manifests as documentTypeManifests } from './document-types/manifests.js'; import { manifests as sectionManifests } from './section/manifests.js'; -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [ +export const manifests: Array = [ ...dashboardManifests, ...documentBlueprintManifests, ...documentManifests, diff --git a/src/Umbraco.Web.UI.Client/src/packages/help/header-app/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/help/header-app/manifests.ts index 46bb441c2c..0d7683d81b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/help/header-app/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/help/header-app/manifests.ts @@ -1,6 +1,6 @@ -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [ +export const manifests: Array = [ { type: 'headerApp', alias: 'Umb.HeaderApp.Help', diff --git a/src/Umbraco.Web.UI.Client/src/packages/help/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/help/manifests.ts index 223544e6db..a9341572e6 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/help/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/help/manifests.ts @@ -1,5 +1,5 @@ import { manifests as headerAppManifests } from './header-app/manifests.js'; import { manifests as menuManifests } from './menu/manifests.js'; -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [...menuManifests, ...headerAppManifests]; +export const manifests: Array = [...menuManifests, ...headerAppManifests]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/help/menu/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/help/menu/manifests.ts index ee466c9a80..42eee1d497 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/help/menu/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/help/menu/manifests.ts @@ -1,8 +1,8 @@ import { UMB_HELP_MENU_ALIAS } from './constants.js'; import { UMB_CURRENT_USER_IS_ADMIN_CONDITION_ALIAS } from '@umbraco-cms/backoffice/current-user'; -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [ +export const manifests: Array = [ { type: 'menu', alias: UMB_HELP_MENU_ALIAS, diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/members/manifests.ts index c5d00784c1..7c241eb216 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/members/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/manifests.ts @@ -2,12 +2,12 @@ import { manifests as memberGroupManifests } from './member-group/manifests.js'; import { manifests as memberManifests } from './member/manifests.js'; import { manifests as memberSectionManifests } from './member-section/manifests.js'; import { manifests as memberTypeManifests } from './member-type/manifests.js'; -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; import './member/components/index.js'; import './member-group/components/index.js'; -export const manifests: Array = [ +export const manifests: Array = [ ...memberGroupManifests, ...memberManifests, ...memberSectionManifests, diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member/manifests.ts index 1a80cef0a9..76e8602bd4 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/members/member/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/member/manifests.ts @@ -8,9 +8,9 @@ import { manifests as searchManifests } from './search/manifests.js'; import { manifests as sectionViewManifests } from './section-view/manifests.js'; import { manifests as workspaceManifests } from './workspace/manifests.js'; -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [ +export const manifests: Array = [ ...collectionManifests, ...entityActionManifests, ...memberPickerModalManifests, diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member/picker/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member/picker/manifests.ts index 45e2df590f..8e265d91e2 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/members/member/picker/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/member/picker/manifests.ts @@ -1,7 +1,7 @@ import { UMB_MEMBER_ENTITY_TYPE } from '../entity.js'; -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [ +export const manifests: Array = [ { type: 'pickerSearchResultItem', kind: 'default', diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/manifests.ts index 024c20bf20..0c7f91d162 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/settings/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/settings/manifests.ts @@ -2,9 +2,9 @@ import { manifests as advancedManifests } from './advanced/manifests.js'; import { manifests as sectionManifests } from './section/manifests.js'; import { manifests as structureManifests } from './structure/manifests.js'; import { manifests as welcomeDashboardManifests } from './welcome/manifests.js'; -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [ +export const manifests: Array = [ ...advancedManifests, ...sectionManifests, ...structureManifests, diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/section/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/section/manifests.ts index 7ee23d38be..9d62fe6680 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/settings/section/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/settings/section/manifests.ts @@ -1,7 +1,7 @@ import { UMB_SETTINGS_SECTION_ALIAS } from './constants.js'; -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [ +export const manifests: Array = [ { type: 'section', alias: UMB_SETTINGS_SECTION_ALIAS, diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/structure/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/structure/manifests.ts index 3cc19925a2..1ac3c64d22 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/settings/structure/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/settings/structure/manifests.ts @@ -1,8 +1,8 @@ import { UMB_SETTINGS_SECTION_ALIAS } from '../section/index.js'; import { UMB_STRUCTURE_SETTINGS_MENU_ALIAS } from './constants.js'; -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [ +export const manifests: Array = [ { type: 'menu', alias: UMB_STRUCTURE_SETTINGS_MENU_ALIAS, diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/welcome/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/welcome/manifests.ts index 810c0adb70..09fa315eac 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/settings/welcome/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/settings/welcome/manifests.ts @@ -1,7 +1,7 @@ import { UMB_SETTINGS_SECTION_ALIAS } from '../section/index.js'; -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [ +export const manifests: Array = [ { type: 'dashboard', alias: 'Umb.Dashboard.SettingsWelcome', diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/change-password/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/change-password/manifests.ts index 0a16bdecd3..93c65618ef 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/change-password/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/change-password/manifests.ts @@ -1,7 +1,7 @@ -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; import { UMB_USER_ENTITY_TYPE } from '@umbraco-cms/backoffice/user'; -export const manifests: Array = [ +export const manifests: Array = [ { type: 'entityAction', kind: 'default', diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/action/default.kind.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/action/default.kind.ts index 900bd8ad36..bc0611f9be 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/action/default.kind.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/action/default.kind.ts @@ -1,6 +1,6 @@ -import type { UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifest: UmbBackofficeManifestKind = { +export const manifest: UmbExtensionManifestKind = { type: 'kind', alias: 'Umb.Kind.CurrentUserAction.Default', matchKind: 'default', diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/section/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/section/manifests.ts index bb49da5322..2a4ee46c56 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/section/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/section/manifests.ts @@ -4,7 +4,7 @@ import { manifests as menuManifests } from './menu/manifests.js'; import type { ManifestSection, ManifestTypes, - UmbBackofficeManifestKind, + UmbExtensionManifestKind, } from '@umbraco-cms/backoffice/extension-registry'; const section: ManifestSection = { @@ -24,7 +24,7 @@ const section: ManifestSection = { ], }; -export const manifests: Array = [ +export const manifests: Array = [ section, ...sectionSidebarAppManifests, ...menuManifests, diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/section/sidebar-app/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/section/sidebar-app/manifests.ts index f21d698bc2..446a1564fe 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/section/sidebar-app/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/section/sidebar-app/manifests.ts @@ -1,8 +1,8 @@ import { UMB_USER_MANAGEMENT_SECTION_ALIAS } from '../constants.js'; import { UMB_USER_MANAGEMENT_MENU_ALIAS } from '../menu/index.js'; -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [ +export const manifests: Array = [ { type: 'sectionSidebarApp', kind: 'menu', diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/manifests.ts index 7db75cbebf..93212cf9a7 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/manifests.ts @@ -7,9 +7,9 @@ import { manifests as repositoryManifests } from './repository/manifests.js'; import { manifests as sectionViewManifests } from './workspace/user-group-root/manifests.js'; import { manifests as workspaceManifests } from './workspace/manifests.js'; -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [ +export const manifests: Array = [ ...collectionManifests, ...entityActionManifests, ...entityBulkActionManifests, diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/manifests.ts index 806ce0f556..b548297814 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/manifests.ts @@ -1,4 +1,4 @@ import { manifests as userGroupManifests } from './user-group/manifests.js'; -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [...userGroupManifests]; +export const manifests: Array = [...userGroupManifests]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group-root/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group-root/manifests.ts index ac7b088e93..d6e53a447e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group-root/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group-root/manifests.ts @@ -1,7 +1,7 @@ import { UMB_USER_GROUP_ROOT_ENTITY_TYPE } from '../../entity.js'; -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [ +export const manifests: Array = [ { type: 'workspace', alias: 'Umb.Workspace.UserGroupRoot', diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/client-credential/create/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/client-credential/create/manifests.ts index 420b53915c..4fd55ee4a3 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/client-credential/create/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/client-credential/create/manifests.ts @@ -1,5 +1,5 @@ import { manifests as modalManifests } from './modal/manifests.js'; -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [...modalManifests]; +export const manifests: Array = [...modalManifests]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/client-credential/create/modal/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/client-credential/create/modal/manifests.ts index 662ecec620..7415b75d01 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/client-credential/create/modal/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/client-credential/create/modal/manifests.ts @@ -1,7 +1,7 @@ import { UMB_CREATE_USER_CLIENT_CREDENTIAL_MODAL_ALIAS } from './constants.js'; -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [ +export const manifests: Array = [ { type: 'modal', alias: UMB_CREATE_USER_CLIENT_CREDENTIAL_MODAL_ALIAS, diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/client-credential/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/client-credential/manifests.ts index eba4cdb996..91c766951b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/client-credential/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/client-credential/manifests.ts @@ -1,5 +1,5 @@ import { manifests as createManifests } from './create/manifests.js'; import { manifests as repositoryManifests } from './repository/manifests.js'; -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [...createManifests, ...repositoryManifests]; +export const manifests: Array = [...createManifests, ...repositoryManifests]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/client-credential/repository/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/client-credential/repository/manifests.ts index a77e1c8998..c0c8538837 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/client-credential/repository/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/client-credential/repository/manifests.ts @@ -1,7 +1,7 @@ import { UMB_USER_CLIENT_CREDENTIAL_REPOSITORY_ALIAS } from './constants.js'; -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [ +export const manifests: Array = [ { type: 'repository', alias: UMB_USER_CLIENT_CREDENTIAL_REPOSITORY_ALIAS, diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/create/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/create/manifests.ts index 7915152337..f964b81595 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/create/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/create/manifests.ts @@ -2,9 +2,9 @@ import { UMB_USER_ROOT_ENTITY_TYPE } from '../../entity.js'; import { manifests as modalManifests } from './modal/manifests.js'; -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [ +export const manifests: Array = [ { type: 'entityAction', kind: 'default', diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/create/modal/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/create/modal/manifests.ts index 2c736c75fd..829e6c475e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/create/modal/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/create/modal/manifests.ts @@ -1,6 +1,6 @@ -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [ +export const manifests: Array = [ { type: 'modal', alias: 'Umb.Modal.User.CreateOptions', diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/manifests.ts index f59da30aeb..b4cec95f15 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/manifests.ts @@ -3,7 +3,7 @@ import { UMB_USER_ENTITY_TYPE } from '../entity.js'; import { manifests as createManifests } from './create/manifests.js'; -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; const entityActions: Array = [ { @@ -96,4 +96,4 @@ const entityActions: Array = [ }, ]; -export const manifests: Array = [...entityActions, ...createManifests]; +export const manifests: Array = [...entityActions, ...createManifests]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/entity-action/invite/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/entity-action/invite/manifests.ts index 64ca8e8772..816f073b74 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/entity-action/invite/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/entity-action/invite/manifests.ts @@ -1,8 +1,8 @@ import { UMB_USER_ROOT_ENTITY_TYPE } from '../../../entity.js'; -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [ +export const manifests: Array = [ { type: 'entityAction', kind: 'default', diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/entity-action/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/entity-action/manifests.ts index 0958868a9f..defa3335b6 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/entity-action/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/entity-action/manifests.ts @@ -1,9 +1,9 @@ import { manifests as inviteManifests } from './invite/manifests.js'; import { manifests as resendInviteManifests } from './resend-invite/manifests.js'; -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [ +export const manifests: Array = [ ...inviteManifests, ...resendInviteManifests, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/manifests.ts index 3d56168a11..1479185c5d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/manifests.ts @@ -2,9 +2,9 @@ import { manifests as collectionActionManifests } from './collection-action/mani import { manifests as modalManifests } from './modal/manifests.js'; import { manifests as repositoryManifests } from './repository/manifests.js'; import { manifests as entityActionManifests } from './entity-action/manifests.js'; -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [ +export const manifests: Array = [ ...collectionActionManifests, ...modalManifests, ...repositoryManifests, diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/manifests.ts index 4e03fe4f97..58bbe21cab 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/manifests.ts @@ -9,9 +9,9 @@ import { manifests as propertyEditorManifests } from './property-editor/manifest import { manifests as repositoryManifests } from './repository/manifests.js'; import { manifests as workspaceManifests } from './workspace/manifests.js'; import { manifests as menuItemManifests } from './menu-item/manifests.js'; -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [ +export const manifests: Array = [ ...clientCredentialManifests, ...collectionManifests, ...conditionsManifests, diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/manifests.ts index 2208cee94d..d669f65a36 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/manifests.ts @@ -1,5 +1,5 @@ import { manifests as userManifests } from './user/manifests.js'; import { manifests as userRootManifests } from './user-root/manifests.js'; -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [...userManifests, ...userRootManifests]; +export const manifests: Array = [...userManifests, ...userRootManifests]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user-root/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user-root/manifests.ts index 9cb07892d3..33f3f151ff 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user-root/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user-root/manifests.ts @@ -1,7 +1,7 @@ import { UMB_USER_ROOT_ENTITY_TYPE } from '../../entity.js'; -import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [ +export const manifests: Array = [ { type: 'workspace', alias: 'Umb.Workspace.UserRoot', From a6196f79b356cb47238d5513c4f89366d4e1e3cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Fri, 13 Sep 2024 17:09:39 +0200 Subject: [PATCH 43/43] correct manifests --- .../packages/core/menu/components/menu-item/manifests.ts | 3 ++- .../src/packages/core/menu/manifests.ts | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/menu/components/menu-item/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/menu/components/menu-item/manifests.ts index 528da3258a..4154e99d0a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/menu/components/menu-item/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/menu/components/menu-item/manifests.ts @@ -1,3 +1,4 @@ import { manifests as linkManifests } from './link/manifests.js'; +import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [...linkManifests]; +export const manifests: Array = [...linkManifests]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/menu/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/menu/manifests.ts index 902c1fe47a..a9d3417c61 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/menu/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/menu/manifests.ts @@ -1,4 +1,8 @@ import { manifests as menuItemManifests } from './components/menu-item/manifests.js'; import { manifest as menuAliasConditionManifest } from './conditions/menu-alias.condition.js'; +import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [...menuItemManifests, menuAliasConditionManifest]; +export const manifests: Array = [ + ...menuItemManifests, + menuAliasConditionManifest, +];