diff --git a/src/Umbraco.Web.UI.Client/src/installer/installer-consent.element.ts b/src/Umbraco.Web.UI.Client/src/installer/installer-consent.element.ts index 57c1418077..1051ba540c 100644 --- a/src/Umbraco.Web.UI.Client/src/installer/installer-consent.element.ts +++ b/src/Umbraco.Web.UI.Client/src/installer/installer-consent.element.ts @@ -48,10 +48,10 @@ export class UmbInstallerConsent extends UmbContextConsumerMixin(LitElement) { private _telemetryLevels: TelemetryModel[] = []; @state() - private _telemetryFormData!: TelemetryModel['level']; + private _telemetryFormData?: TelemetryModel['level']; @state() - private _installerStore!: UmbInstallerContext; + private _installerStore?: UmbInstallerContext; private storeDataSubscription?: Subscription; private storeSettingsSubscription?: Subscription; @@ -85,7 +85,7 @@ export class UmbInstallerConsent extends UmbContextConsumerMixin(LitElement) { const value: { [key: string]: string } = {}; value[target.name] = this._telemetryLevels[parseInt(target.value) - 1].level; - this._installerStore.appendData(value); + this._installerStore?.appendData(value); } private _onNext() { @@ -105,7 +105,7 @@ export class UmbInstallerConsent extends UmbContextConsumerMixin(LitElement) { } private _renderSlider() { - if (!this._telemetryLevels) return; + if (!this._telemetryLevels || this._telemetryLevels.length < 1) return; return html` { @@ -167,7 +167,7 @@ export class UmbInstallerDatabase extends UmbContextConsumerMixin(LitElement) { const useIntegratedAuthentication = formData.has('useIntegratedAuthentication'); const database = { - ...this._installerStore.getData().database, + ...this._installerStore?.getData().database, id, username, password, @@ -176,10 +176,10 @@ export class UmbInstallerDatabase extends UmbContextConsumerMixin(LitElement) { useIntegratedAuthentication, } as UmbracoPerformInstallDatabaseConfiguration; - this._installerStore.appendData({ database }); + this._installerStore?.appendData({ database }); } - this._installerStore.requestInstall().then(this._handleFulfilled.bind(this), this._handleRejected.bind(this)); + this._installerStore?.requestInstall().then(this._handleFulfilled.bind(this), this._handleRejected.bind(this)); this._installButton.state = 'waiting'; }; private _handleFulfilled() { @@ -195,7 +195,7 @@ export class UmbInstallerDatabase extends UmbContextConsumerMixin(LitElement) { } private get selectedDatabase() { - const id = this._installerStore.getData().database?.id; + const id = this._installerStore?.getData().database?.id; console.log('selected id', id, this._databases); return this._databases.find((x) => x.id === id) ?? this._databases[0]; } diff --git a/src/Umbraco.Web.UI.Client/src/installer/installer-user.element.ts b/src/Umbraco.Web.UI.Client/src/installer/installer-user.element.ts index 6686843774..62ded475be 100644 --- a/src/Umbraco.Web.UI.Client/src/installer/installer-user.element.ts +++ b/src/Umbraco.Web.UI.Client/src/installer/installer-user.element.ts @@ -57,10 +57,10 @@ export class UmbInstallerUser extends UmbContextConsumerMixin(LitElement) { ]; @state() - private _userFormData!: { name: string; password: string; email: string; subscribeToNewsletter: boolean }; + private _userFormData?: { name: string; password: string; email: string; subscribeToNewsletter: boolean }; @state() - private _installerStore!: UmbInstallerContext; + private _installerStore?: UmbInstallerContext; private installerStoreSubscription?: Subscription; @@ -101,7 +101,7 @@ export class UmbInstallerUser extends UmbContextConsumerMixin(LitElement) { const email = formData.get('email'); const subscribeToNewsletter = formData.has('subscribeToNewsletter'); - this._installerStore.appendData({ user: { name, password, email, subscribeToNewsletter } }); + this._installerStore?.appendData({ user: { name, password, email, subscribeToNewsletter } }); this.dispatchEvent(new CustomEvent('next', { bubbles: true, composed: true })); }; @@ -115,7 +115,7 @@ export class UmbInstallerUser extends UmbContextConsumerMixin(LitElement) { @@ -126,7 +126,7 @@ export class UmbInstallerUser extends UmbContextConsumerMixin(LitElement) { @@ -137,7 +137,7 @@ export class UmbInstallerUser extends UmbContextConsumerMixin(LitElement) { @@ -146,7 +146,7 @@ export class UmbInstallerUser extends UmbContextConsumerMixin(LitElement) { + .checked=${this._userFormData?.subscribeToNewsletter || false}> Keep me updated on Umbraco Versions, Security Bulletins and Community News