From 2f57d7f427093952c917969f1f3b8ce90088419b Mon Sep 17 00:00:00 2001
From: Jens Langhammer <jens.langhammer@beryju.org>
Date: Wed, 29 Jun 2022 21:45:38 +0200
Subject: [PATCH] web/admin: fix wizard type selection

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
---
 .../pages/outposts/ServiceConnectionWizard.ts |  2 +-
 web/src/pages/policies/PolicyWizard.ts        |  2 +-
 .../PropertyMappingWizard.ts                  |  2 +-
 web/src/pages/providers/ProviderWizard.ts     | 46 ++++++++++---------
 web/src/pages/sources/SourceWizard.ts         |  2 +-
 web/src/pages/stages/StageWizard.ts           |  2 +-
 6 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/web/src/pages/outposts/ServiceConnectionWizard.ts b/web/src/pages/outposts/ServiceConnectionWizard.ts
index 94805719f..01c7c96cf 100644
--- a/web/src/pages/outposts/ServiceConnectionWizard.ts
+++ b/web/src/pages/outposts/ServiceConnectionWizard.ts
@@ -44,7 +44,7 @@ export class InitialServiceConnectionWizardPage extends WizardPage {
                                 "initial",
                                 `type-${type.component}-${type.modelName}`,
                             ];
-                            this._isValid = true;
+                            this.host.isValid = true;
                         }}
                     />
                     <label class="pf-c-radio__label" for=${`${type.component}-${type.modelName}`}
diff --git a/web/src/pages/policies/PolicyWizard.ts b/web/src/pages/policies/PolicyWizard.ts
index 92803870a..ad07ffe8b 100644
--- a/web/src/pages/policies/PolicyWizard.ts
+++ b/web/src/pages/policies/PolicyWizard.ts
@@ -49,7 +49,7 @@ export class InitialPolicyWizardPage extends WizardPage {
                                 "initial",
                                 `type-${type.component}-${type.modelName}`,
                             ];
-                            this._isValid = true;
+                            this.host.isValid = true;
                         }}
                     />
                     <label class="pf-c-radio__label" for=${`${type.component}-${type.modelName}`}
diff --git a/web/src/pages/property-mappings/PropertyMappingWizard.ts b/web/src/pages/property-mappings/PropertyMappingWizard.ts
index 2321cb153..4daeed20b 100644
--- a/web/src/pages/property-mappings/PropertyMappingWizard.ts
+++ b/web/src/pages/property-mappings/PropertyMappingWizard.ts
@@ -47,7 +47,7 @@ export class InitialPropertyMappingWizardPage extends WizardPage {
                                 "initial",
                                 `type-${type.component}-${type.modelName}`,
                             ];
-                            this._isValid = true;
+                            this.host.isValid = true;
                         }}
                     />
                     <label class="pf-c-radio__label" for=${`${type.component}-${type.modelName}`}
diff --git a/web/src/pages/providers/ProviderWizard.ts b/web/src/pages/providers/ProviderWizard.ts
index 787904e04..69e8dc0f7 100644
--- a/web/src/pages/providers/ProviderWizard.ts
+++ b/web/src/pages/providers/ProviderWizard.ts
@@ -1,5 +1,6 @@
 import { DEFAULT_CONFIG } from "@goauthentik/web/api/Config";
 import "@goauthentik/web/elements/forms/ProxyForm";
+import { paramURL } from "@goauthentik/web/elements/router/RouterOutlet";
 import "@goauthentik/web/elements/wizard/FormWizardPage";
 import "@goauthentik/web/elements/wizard/Wizard";
 import { WizardPage } from "@goauthentik/web/elements/wizard/WizardPage";
@@ -34,8 +35,8 @@ export class InitialProviderWizardPage extends WizardPage {
     }
     sidebarLabel = () => t`Select type`;
 
-    render(): TemplateResult {
-        return html` <div class="pf-c-hint">
+    renderHint(): TemplateResult {
+        return html`<div class="pf-c-hint">
                 <div class="pf-c-hint__title">${t`Try the new application wizard`}</div>
                 <div class="pf-c-hint__body">
                     ${t`The new application wizard greatly simplifies the steps required to create applications and providers.`}
@@ -50,25 +51,28 @@ export class InitialProviderWizardPage extends WizardPage {
                     >
                 </div>
             </div>
-            <br />
-            <form class="pf-c-form pf-m-horizontal">
-                ${this.providerTypes.map((type) => {
-                    return html`<div class="pf-c-radio">
-                        <input
-                            class="pf-c-radio__input"
-                            type="radio"
-                            name="type"
-                            id=${type.component}
-                            @change=${() => {
-                                this.host.steps = ["initial", `type-${type.component}`];
-                                this._isValid = true;
-                            }}
-                        />
-                        <label class="pf-c-radio__label" for=${type.component}>${type.name}</label>
-                        <span class="pf-c-radio__description">${type.description}</span>
-                    </div>`;
-                })}
-            </form>`;
+            <br />`;
+    }
+
+    render(): TemplateResult {
+        return html` <form class="pf-c-form pf-m-horizontal">
+            ${this.providerTypes.map((type) => {
+                return html`<div class="pf-c-radio">
+                    <input
+                        class="pf-c-radio__input"
+                        type="radio"
+                        name="type"
+                        id=${type.component}
+                        @change=${() => {
+                            this.host.steps = ["initial", `type-${type.component}`];
+                            this.host.isValid = true;
+                        }}
+                    />
+                    <label class="pf-c-radio__label" for=${type.component}>${type.name}</label>
+                    <span class="pf-c-radio__description">${type.description}</span>
+                </div>`;
+            })}
+        </form>`;
     }
 }
 
diff --git a/web/src/pages/sources/SourceWizard.ts b/web/src/pages/sources/SourceWizard.ts
index cd9791592..ba32e605f 100644
--- a/web/src/pages/sources/SourceWizard.ts
+++ b/web/src/pages/sources/SourceWizard.ts
@@ -46,7 +46,7 @@ export class InitialSourceWizardPage extends WizardPage {
                                 "initial",
                                 `type-${type.component}-${type.modelName}`,
                             ];
-                            this._isValid = true;
+                            this.host.isValid = true;
                         }}
                     />
                     <label class="pf-c-radio__label" for=${`${type.component}-${type.modelName}`}
diff --git a/web/src/pages/stages/StageWizard.ts b/web/src/pages/stages/StageWizard.ts
index 2478ea588..6864c3f1f 100644
--- a/web/src/pages/stages/StageWizard.ts
+++ b/web/src/pages/stages/StageWizard.ts
@@ -62,7 +62,7 @@ export class InitialStageWizardPage extends WizardPage {
                                 "initial",
                                 `type-${type.component}-${type.modelName}`,
                             ];
-                            this._isValid = true;
+                            this.host.isValid = true;
                         }}
                     />
                     <label class="pf-c-radio__label" for=${`${type.component}-${type.modelName}`}