From b0cd02cd80234eb8f9a607ab9642897348fc9128 Mon Sep 17 00:00:00 2001
From: JesmoDev <jjensenmoeller@gmail.com>
Date: Wed, 1 Jun 2022 16:58:59 +0200
Subject: [PATCH] Failed install now returns an error

---
 .../src/installer/installer-context.ts             |  6 +++++-
 .../src/installer/installer-database.element.ts    | 14 ++++++++++++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/installer/installer-context.ts b/src/Umbraco.Web.UI.Client/src/installer/installer-context.ts
index 5f4c281a27..625c618fb9 100644
--- a/src/Umbraco.Web.UI.Client/src/installer/installer-context.ts
+++ b/src/Umbraco.Web.UI.Client/src/installer/installer-context.ts
@@ -29,7 +29,11 @@ export class UmbInstallerContext {
   }
 
   public requestInstall() {
-    return postInstall(this._data.getValue());
+    return new Promise((resolve, reject) => {
+      postInstall(this._data.getValue()).then(resolve, ({ data }) => {
+        reject(data);
+      });
+    });
   }
 
   private loadIntallerSettings() {
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 fbce604886..7f4a362469 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
@@ -35,12 +35,19 @@ export class UmbInstallerDatabase extends UmbContextConsumerMixin(LitElement) {
         margin-left: auto;
         min-width: 120px;
       }
+
+      #error-message {
+        color: var(--uui-color-error, red);
+      }
     `,
   ];
 
   @query('#button-install')
   private _installButton!: UUIButtonElement;
 
+  @query('#error-message')
+  private _errorMessage!: HTMLElement;
+
   @property({ attribute: false })
   public databaseFormData!: UmbracoPerformInstallDatabaseConfiguration;
 
@@ -127,9 +134,9 @@ export class UmbInstallerDatabase extends UmbContextConsumerMixin(LitElement) {
   private _handleFulfilled() {
     this.dispatchEvent(new CustomEvent('next', { bubbles: true, composed: true }));
   }
-  private _handleRejected(error: Error) {
+  private _handleRejected(error: any) {
     this._installButton.state = 'failed';
-    console.log('ERROR hallo', error);
+    this._errorMessage.innerText = error.errorMessage;
   }
 
   private _onBack() {
@@ -266,6 +273,9 @@ export class UmbInstallerDatabase extends UmbContextConsumerMixin(LitElement) {
 
           ${this._renderSettings()}
 
+          <!-- Maybe move this error message to the installer.element -->
+          <p id="error-message"></p>
+
           <div id="buttons">
             <uui-button label="Back" @click=${this._onBack} look="secondary"></uui-button>
             <uui-button id="button-install" type="submit" label="Install" look="positive"></uui-button>