From 80f109611f25ce01b8a5794708ec7c22f7872c10 Mon Sep 17 00:00:00 2001
From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com>
Date: Mon, 15 Aug 2022 16:11:41 +0200
Subject: [PATCH] add data-test attributes

---
 .../installer/installer-consent.element.ts    |  2 +-
 .../installer/installer-database.element.ts   | 24 ++++++++++---------
 .../installer/installer-installing.element.ts |  3 ++-
 .../src/installer/installer-user.element.ts   |  2 +-
 4 files changed, 17 insertions(+), 14 deletions(-)

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 6e3c1aec6e..be11bd5f45 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
@@ -125,7 +125,7 @@ export class UmbInstallerConsent extends UmbContextConsumerMixin(LitElement) {
 
 	render() {
 		return html`
-			<div id="container" class="uui-text">
+			<div id="container" class="uui-text" data-test="installer-telemetry">
 				<h1>Consent for telemetry data</h1>
 				${this._renderSlider()}
 				<div id="buttons">
diff --git a/src/Umbraco.Web.UI.Client/src/installer/installer-database.element.ts b/src/Umbraco.Web.UI.Client/src/installer/installer-database.element.ts
index 7afa97afa0..12c29de93d 100644
--- a/src/Umbraco.Web.UI.Client/src/installer/installer-database.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/installer/installer-database.element.ts
@@ -4,11 +4,7 @@ import { customElement, property, query, state } from 'lit/decorators.js';
 import { Subscription } from 'rxjs';
 
 import { UmbContextConsumerMixin } from '../core/context';
-import {
-	ProblemDetails,
-	UmbracoInstallerDatabaseModel,
-	UmbracoPerformInstallDatabaseConfiguration,
-} from '../core/models';
+import { ProblemDetails, UmbracoInstallerDatabaseModel, UmbracoPerformInstallDatabaseConfiguration } from '../core/models';
 import { UmbInstallerContext } from './installer-context';
 
 @customElement('umb-installer-database')
@@ -83,8 +79,8 @@ export class UmbInstallerDatabase extends UmbContextConsumerMixin(LitElement) {
 	@query('#button-install')
 	private _installButton!: UUIButtonElement;
 
-	@query('#error-message')
-	private _errorMessage!: HTMLElement;
+	@state()
+	private _errorMessage = '';
 
 	@property({ attribute: false })
 	public databaseFormData!: UmbracoPerformInstallDatabaseConfiguration;
@@ -179,16 +175,22 @@ export class UmbInstallerDatabase extends UmbContextConsumerMixin(LitElement) {
 			this._installerStore?.appendData({ database });
 		}
 
-		this._installerStore?.requestInstall().then(this._handleFulfilled.bind(this), this._handleRejected.bind(this));
+		this._installerStore
+			?.requestInstall()
+			.then(this._handleFulfilled.bind(this))
+			.catch(this._handleRejected.bind(this));
 		this._installButton.state = 'waiting';
 	};
+
 	private _handleFulfilled() {
+		sessionStorage.setItem('is-authenticated', 'true');
 		this.dispatchEvent(new CustomEvent('next', { bubbles: true, composed: true }));
 		this._installButton.state = undefined;
 	}
+
 	private _handleRejected(error: ProblemDetails) {
 		this._installButton.state = 'failed';
-		this._errorMessage.innerText = error.type;
+		this._errorMessage = error.detail ?? 'Something went wrong';
 	}
 
 	private _onBack() {
@@ -333,7 +335,7 @@ export class UmbInstallerDatabase extends UmbContextConsumerMixin(LitElement) {
 	`;
 
 	render() {
-		return html` <div id="container" class="uui-text">
+		return html` <div id="container" class="uui-text" data-test="installer-database">
 			<h1 class="uui-h3">Database Configuration</h1>
 			<uui-form>
 				<form id="database-form" name="database" @submit="${this._handleSubmit}">
@@ -342,7 +344,7 @@ export class UmbInstallerDatabase extends UmbContextConsumerMixin(LitElement) {
 						: this._renderDatabaseSelection()}
 
 					<!-- TODO: Apply error message to the fields that has errors -->
-					<p id="error-message"></p>
+					${this._errorMessage ? html` <p id="error-message">${this._errorMessage}</p>` : ''}
 
 					<div id="buttons">
 						<uui-button label="Back" @click=${this._onBack} look="secondary"></uui-button>
diff --git a/src/Umbraco.Web.UI.Client/src/installer/installer-installing.element.ts b/src/Umbraco.Web.UI.Client/src/installer/installer-installing.element.ts
index 33117bdc83..3ebf0c67e4 100644
--- a/src/Umbraco.Web.UI.Client/src/installer/installer-installing.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/installer/installer-installing.element.ts
@@ -1,5 +1,6 @@
 import { css, CSSResultGroup, html, LitElement, PropertyValueMap } from 'lit';
 import { customElement, state } from 'lit/decorators.js';
+
 @customElement('umb-installer-installing')
 export class UmbInstallerInstalling extends LitElement {
 	static styles: CSSResultGroup = [
@@ -33,7 +34,7 @@ export class UmbInstallerInstalling extends LitElement {
 	}
 
 	render() {
-		return html` <div class="uui-text">
+		return html` <div class="uui-text" data-test="installer-installing">
 			<h1 class="uui-h3">Installing Umbraco</h1>
 			<uui-progress-bar progress=${this._installProgress}></uui-progress-bar>
 		</div>`;
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 20c5dcdf68..d0ed7008a6 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
@@ -107,7 +107,7 @@ export class UmbInstallerUser extends UmbContextConsumerMixin(LitElement) {
 	};
 
 	render() {
-		return html` <div id="container" class="uui-text">
+		return html` <div id="container" class="uui-text" data-test="installer-user">
 			<h1>Install Umbraco</h1>
 			<uui-form>
 				<form id="LoginForm" name="login" @submit="${this._handleSubmit}">