From 0f5e0a774a7c28a865aac6a25ea5b8bf08adb0ab Mon Sep 17 00:00:00 2001
From: Jens Langhammer
Date: Tue, 10 Aug 2021 23:26:17 +0200
Subject: [PATCH] web/admin: fix ScopeMapping requiring description
Signed-off-by: Jens Langhammer
---
web/src/elements/buttons/ModalButton.ts | 14 +++++++++-----
.../property-mappings/PropertyMappingScopeForm.ts | 7 +------
2 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/web/src/elements/buttons/ModalButton.ts b/web/src/elements/buttons/ModalButton.ts
index 2b4130475..46171a9e8 100644
--- a/web/src/elements/buttons/ModalButton.ts
+++ b/web/src/elements/buttons/ModalButton.ts
@@ -46,6 +46,8 @@ export class ModalButton extends LitElement {
@property({ type: Boolean })
open = false;
+ handlerBound = false;
+
static get styles(): CSSResult[] {
return [
PFBase,
@@ -64,20 +66,22 @@ export class ModalButton extends LitElement {
];
}
- firstUpdated(): void {
+ connectedCallback(): void {
+ if (this.handlerBound) return;
window.addEventListener("keyup", this.keyUpHandler);
+ this.handlerBound = true;
}
- keyUpHandler = (e: KeyboardEvent) => {
+ keyUpHandler = (e: KeyboardEvent): void => {
if (e.code === "Escape") {
this.resetForms();
this.open = false;
}
- }
+ };
disconnectedCallback(): void {
- super.disconnectedCallback()
- window.removeEventListener("keyup", this.keyUpHandler)
+ super.disconnectedCallback();
+ window.removeEventListener("keyup", this.keyUpHandler);
}
resetForms(): void {
diff --git a/web/src/pages/property-mappings/PropertyMappingScopeForm.ts b/web/src/pages/property-mappings/PropertyMappingScopeForm.ts
index f31076bd0..a7f78132d 100644
--- a/web/src/pages/property-mappings/PropertyMappingScopeForm.ts
+++ b/web/src/pages/property-mappings/PropertyMappingScopeForm.ts
@@ -58,16 +58,11 @@ export class PropertyMappingScopeForm extends ModelForm {
${t`Scope which the client can specify to access these properties.`}
-
+
${t`Description shown to the user when consenting. If left empty, the user won't be informed.`}