From 9761c32365b8df7c81cd6cf60593ed0299db00a1 Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Fri, 29 Jul 2022 11:08:45 +0200 Subject: [PATCH] update docs for upgrader elements --- .../src/upgrader/upgrader-view.element.ts | 2 +- .../src/upgrader/upgrader.element.ts | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/upgrader/upgrader-view.element.ts b/src/Umbraco.Web.UI.Client/src/upgrader/upgrader-view.element.ts index 0bd00a8250..5e814d0d11 100644 --- a/src/Umbraco.Web.UI.Client/src/upgrader/upgrader-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/upgrader/upgrader-view.element.ts @@ -7,7 +7,7 @@ import { UmbracoUpgrader } from '../core/models'; /** * @element umb-upgrader-view - * @fires {SubmitEvent} onAuthorizeUpgrade - fires when the user clicks the continue button + * @fires {CustomEvent} onAuthorizeUpgrade - fires when the user clicks the continue button */ @customElement('umb-upgrader-view') export class UmbUpgraderView extends LitElement { diff --git a/src/Umbraco.Web.UI.Client/src/upgrader/upgrader.element.ts b/src/Umbraco.Web.UI.Client/src/upgrader/upgrader.element.ts index d7b1480841..bab6eb71da 100644 --- a/src/Umbraco.Web.UI.Client/src/upgrader/upgrader.element.ts +++ b/src/Umbraco.Web.UI.Client/src/upgrader/upgrader.element.ts @@ -6,6 +6,9 @@ import { customElement, state } from 'lit/decorators.js'; import { getUpgradeSettings, PostUpgradeAuthorize } from '../core/api/fetcher'; import { UmbracoUpgrader } from '../core/models'; +/** + * @element umb-upgrader + */ @customElement('umb-upgrader') export class UmbUpgrader extends LitElement { @state() @@ -50,20 +53,22 @@ export class UmbUpgrader extends LitElement { this.fetching = false; } - _handleSubmit = async () => { + _handleSubmit = async (e: CustomEvent) => { + e.stopPropagation(); this.errorMessage = ''; this.upgrading = true; try { await PostUpgradeAuthorize({}); - history.pushState(null, '', '/'); } catch (e) { if (e instanceof PostUpgradeAuthorize.Error) { const error = e.getActualType(); if (error.status === 400) { - this.errorMessage = error.data.detail || 'Unknown error'; + this.errorMessage = error.data.detail || 'Unknown error, please try again'; } + } else { + this.errorMessage = 'Unknown error, please try again'; } }