From a943b0deb167ab4b81bee55739aec3cd42ff9c99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Wed, 4 Jan 2023 09:43:58 +0100 Subject: [PATCH] implement umblitlement --- .../src/installer/consent/installer-consent.element.ts | 7 +++---- .../src/installer/database/installer-database.element.ts | 9 ++++----- .../src/installer/error/installer-error.element.ts | 7 +++---- .../src/installer/user/installer-user.element.ts | 7 +++---- 4 files changed, 13 insertions(+), 17 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/installer/consent/installer-consent.element.ts b/src/Umbraco.Web.UI.Client/src/installer/consent/installer-consent.element.ts index 708395f34b..c2ca6eabcc 100644 --- a/src/Umbraco.Web.UI.Client/src/installer/consent/installer-consent.element.ts +++ b/src/Umbraco.Web.UI.Client/src/installer/consent/installer-consent.element.ts @@ -1,14 +1,13 @@ -import { css, CSSResultGroup, html, LitElement } from 'lit'; +import { css, CSSResultGroup, html } from 'lit'; import { customElement, state } from 'lit/decorators.js'; import { unsafeHTML } from 'lit/directives/unsafe-html.js'; import { UmbInstallerContext } from '../installer.context'; -import { UmbObserverMixin } from '@umbraco-cms/observable-api'; -import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; import { ConsentLevel, Install, InstallSettings, Telemetry, TelemetryLevel } from '@umbraco-cms/backend-api'; +import { UmbLitElement } from '@umbraco-cms/element'; @customElement('umb-installer-consent') -export class UmbInstallerConsentElement extends UmbContextConsumerMixin(UmbObserverMixin(LitElement)) { +export class UmbInstallerConsentElement extends UmbLitElement { static styles: CSSResultGroup = [ css` :host, diff --git a/src/Umbraco.Web.UI.Client/src/installer/database/installer-database.element.ts b/src/Umbraco.Web.UI.Client/src/installer/database/installer-database.element.ts index 995e231b87..41a9eb289e 100644 --- a/src/Umbraco.Web.UI.Client/src/installer/database/installer-database.element.ts +++ b/src/Umbraco.Web.UI.Client/src/installer/database/installer-database.element.ts @@ -1,10 +1,8 @@ import { UUIButtonElement } from '@umbraco-ui/uui'; -import { css, CSSResultGroup, html, LitElement, nothing } from 'lit'; +import { css, CSSResultGroup, html, nothing } from 'lit'; import { customElement, property, query, state } from 'lit/decorators.js'; import { UmbInstallerContext } from '../installer.context'; -import { UmbObserverMixin } from '@umbraco-cms/observable-api'; -import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; import { ApiError, DatabaseInstall, @@ -14,9 +12,10 @@ import { InstallSettings, ProblemDetails, } from '@umbraco-cms/backend-api'; +import { UmbLitElement } from '@umbraco-cms/element'; @customElement('umb-installer-database') -export class UmbInstallerDatabaseElement extends UmbContextConsumerMixin(UmbObserverMixin(LitElement)) { +export class UmbInstallerDatabaseElement extends UmbLitElement { static styles: CSSResultGroup = [ css` :host, @@ -123,7 +122,7 @@ export class UmbInstallerDatabaseElement extends UmbContextConsumerMixin(UmbObse if (!this._preConfiguredDatabase) { this._options = this._databases.map((x, i) => ({ name: x.displayName ?? 'Unknown database', - value: x.id!, + value: x.id!, // TODO: re visit this ! selected: i === 0, })); } diff --git a/src/Umbraco.Web.UI.Client/src/installer/error/installer-error.element.ts b/src/Umbraco.Web.UI.Client/src/installer/error/installer-error.element.ts index 5063330362..262ca89e8c 100644 --- a/src/Umbraco.Web.UI.Client/src/installer/error/installer-error.element.ts +++ b/src/Umbraco.Web.UI.Client/src/installer/error/installer-error.element.ts @@ -1,14 +1,13 @@ -import { css, CSSResultGroup, html, LitElement, nothing } from 'lit'; +import { css, CSSResultGroup, html, nothing } from 'lit'; import { customElement, state } from 'lit/decorators.js'; import { UmbInstallerContext } from '../installer.context'; import { ProblemDetails } from '@umbraco-cms/backend-api'; -import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; -import { UmbObserverMixin } from '@umbraco-cms/observable-api'; +import { UmbLitElement } from '@umbraco-cms/element'; @customElement('umb-installer-error') -export class UmbInstallerErrorElement extends UmbContextConsumerMixin(UmbObserverMixin(LitElement)) { +export class UmbInstallerErrorElement extends UmbLitElement { static styles: CSSResultGroup = [ css` :host, diff --git a/src/Umbraco.Web.UI.Client/src/installer/user/installer-user.element.ts b/src/Umbraco.Web.UI.Client/src/installer/user/installer-user.element.ts index f211f8c820..fe8b2eeb87 100644 --- a/src/Umbraco.Web.UI.Client/src/installer/user/installer-user.element.ts +++ b/src/Umbraco.Web.UI.Client/src/installer/user/installer-user.element.ts @@ -1,13 +1,12 @@ -import { css, CSSResultGroup, html, LitElement } from 'lit'; +import { css, CSSResultGroup, html } from 'lit'; import { customElement, state } from 'lit/decorators.js'; import { UmbInstallerContext } from '../installer.context'; import { Install } from '@umbraco-cms/backend-api'; -import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; -import { UmbObserverMixin } from '@umbraco-cms/observable-api'; +import { UmbLitElement } from '@umbraco-cms/element'; @customElement('umb-installer-user') -export class UmbInstallerUserElement extends UmbContextConsumerMixin(UmbObserverMixin(LitElement)) { +export class UmbInstallerUserElement extends UmbLitElement { static styles: CSSResultGroup = [ css` :host,