From 240136154b910920594fded4d85d0776b0fa55af Mon Sep 17 00:00:00 2001
From: Jens Langhammer <jens.langhammer@beryju.org>
Date: Sat, 17 Apr 2021 19:37:13 +0200
Subject: [PATCH] web/admin: fix default for codemirror

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
---
 web/src/pages/groups/GroupForm.ts                         | 2 +-
 web/src/pages/outposts/ServiceConnectionKubernetesForm.ts | 2 +-
 web/src/pages/stages/invitation/InvitationForm.ts         | 3 ++-
 web/src/pages/users/UserForm.ts                           | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/web/src/pages/groups/GroupForm.ts b/web/src/pages/groups/GroupForm.ts
index 8aa43c32f..068a737a1 100644
--- a/web/src/pages/groups/GroupForm.ts
+++ b/web/src/pages/groups/GroupForm.ts
@@ -121,7 +121,7 @@ export class GroupForm extends Form<Group> {
             <ak-form-element-horizontal
                 label=${t`Attributes`}
                 name="attributes">
-                <ak-codemirror mode="yaml" value="${YAML.stringify(this.group?.attributes)}">
+                <ak-codemirror mode="yaml" value="${YAML.stringify(first(this.group?.attributes, {}))}">
                 </ak-codemirror>
                 <p class="pf-c-form__helper-text">${t`Set custom attributes using YAML or JSON.`}</p>
             </ak-form-element-horizontal>
diff --git a/web/src/pages/outposts/ServiceConnectionKubernetesForm.ts b/web/src/pages/outposts/ServiceConnectionKubernetesForm.ts
index 1d9a5c998..4e5252df4 100644
--- a/web/src/pages/outposts/ServiceConnectionKubernetesForm.ts
+++ b/web/src/pages/outposts/ServiceConnectionKubernetesForm.ts
@@ -65,7 +65,7 @@ export class ServiceConnectionKubernetesForm extends Form<KubernetesServiceConne
             <ak-form-element-horizontal
                 label=${t`Kubeconfig`}
                 name="kubeconfig">
-                <ak-codemirror mode="yaml" value="${YAML.stringify(this.sc?.kubeconfig)}">
+                <ak-codemirror mode="yaml" value="${YAML.stringify(first(this.sc?.kubeconfig, {}))}">
                 </ak-codemirror>
                 <p class="pf-c-form__helper-text">${t`Set custom attributes using YAML or JSON.`}</p>
             </ak-form-element-horizontal>
diff --git a/web/src/pages/stages/invitation/InvitationForm.ts b/web/src/pages/stages/invitation/InvitationForm.ts
index d104f758c..7497706a6 100644
--- a/web/src/pages/stages/invitation/InvitationForm.ts
+++ b/web/src/pages/stages/invitation/InvitationForm.ts
@@ -7,6 +7,7 @@ import { Form } from "../../../elements/forms/Form";
 import "../../../elements/forms/HorizontalFormElement";
 import "../../../elements/CodeMirror";
 import YAML from "yaml";
+import { first } from "../../../utils";
 
 @customElement("ak-invitation-form")
 export class InvitationForm extends Form<Invitation> {
@@ -46,7 +47,7 @@ export class InvitationForm extends Form<Invitation> {
             <ak-form-element-horizontal
                 label=${t`Attributes`}
                 name="fixedData">
-                <ak-codemirror mode="yaml" value="${YAML.stringify(this.invitation?.fixedData)}">
+                <ak-codemirror mode="yaml" value="${YAML.stringify(first(this.invitation?.fixedData, {}))}">
                 </ak-codemirror>
                 <p class="pf-c-form__helper-text">${t`Optional data which is loaded into the flow's 'prompt_data' context variable. YAML or JSON.`}</p>
             </ak-form-element-horizontal>
diff --git a/web/src/pages/users/UserForm.ts b/web/src/pages/users/UserForm.ts
index d1f66c717..13f97b5d3 100644
--- a/web/src/pages/users/UserForm.ts
+++ b/web/src/pages/users/UserForm.ts
@@ -72,7 +72,7 @@ export class UserForm extends Form<User> {
             <ak-form-element-horizontal
                 label=${t`Attributes`}
                 name="attributes">
-                <ak-codemirror mode="yaml" value="${YAML.stringify(this.user?.attributes)}">
+                <ak-codemirror mode="yaml" value="${YAML.stringify(first(this.user?.attributes, {}))}">
                 </ak-codemirror>
                 <p class="pf-c-form__helper-text">${t`Set custom attributes using YAML or JSON.`}</p>
             </ak-form-element-horizontal>