From 9ae69866bdf0191480d96bd1ef1439e0579863e6 Mon Sep 17 00:00:00 2001
From: Jens Langhammer <jens.langhammer@beryju.org>
Date: Thu, 11 Nov 2021 13:41:34 +0100
Subject: [PATCH] web/admin: fix display issues with flow execute buttons

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
---
 web/src/locales/en.po               | 24 +++++++++++++++-----
 web/src/locales/fr_FR.po            | 24 +++++++++++++++-----
 web/src/locales/pseudo-LOCALE.po    | 24 +++++++++++++++-----
 web/src/pages/flows/FlowViewPage.ts | 34 ++++++++++++++---------------
 4 files changed, 70 insertions(+), 36 deletions(-)

diff --git a/web/src/locales/en.po b/web/src/locales/en.po
index 4d2afaba4..594445c4e 100644
--- a/web/src/locales/en.po
+++ b/web/src/locales/en.po
@@ -1415,6 +1415,10 @@ msgstr "Device classes which can be used to authenticate."
 msgid "Device(s)"
 msgstr "Device(s)"
 
+#: src/pages/flows/FlowViewPage.ts
+msgid "Diagram"
+msgstr "Diagram"
+
 #: src/pages/providers/saml/SAMLProviderForm.ts
 #: src/pages/sources/saml/SAMLSourceForm.ts
 msgid "Digest algorithm"
@@ -1720,17 +1724,17 @@ msgstr "Everything is ok."
 msgid "Exception"
 msgstr "Exception"
 
-#: src/pages/flows/FlowViewPage.ts
-msgid "Execute"
-msgstr "Execute"
+#: 
+#~ msgid "Execute"
+#~ msgstr "Execute"
 
 #: src/pages/flows/FlowViewPage.ts
 msgid "Execute flow"
 msgstr "Execute flow"
 
-#: src/pages/flows/FlowViewPage.ts
-msgid "Execute with inspector"
-msgstr "Execute with inspector"
+#: 
+#~ msgid "Execute with inspector"
+#~ msgstr "Execute with inspector"
 
 #: src/pages/policies/expression/ExpressionPolicyForm.ts
 msgid "Executes the python snippet to determine whether to allow or deny a request."
@@ -2964,6 +2968,10 @@ msgstr "No workers connected. Background tasks will not run."
 msgid "None (rule disabled)"
 msgstr "None (rule disabled)"
 
+#: src/pages/flows/FlowViewPage.ts
+msgid "Normal"
+msgstr "Normal"
+
 #: src/pages/outposts/OutpostHealthSimple.ts
 msgid "Not available"
 msgstr "Not available"
@@ -5681,6 +5689,10 @@ msgstr "reference will be reset to default value"
 msgid "reference will be set to an empty value"
 msgstr "reference will be set to an empty value"
 
+#: src/pages/flows/FlowViewPage.ts
+msgid "with inspector"
+msgstr "with inspector"
+
 #: src/elements/Expand.ts
 #: src/elements/Expand.ts
 msgid "{0}"
diff --git a/web/src/locales/fr_FR.po b/web/src/locales/fr_FR.po
index 51fb58eec..a168024c0 100644
--- a/web/src/locales/fr_FR.po
+++ b/web/src/locales/fr_FR.po
@@ -1405,6 +1405,10 @@ msgstr "Classe d'équipement qui peut être utilisé pour s'authentifier"
 msgid "Device(s)"
 msgstr ""
 
+#: src/pages/flows/FlowViewPage.ts
+msgid "Diagram"
+msgstr ""
+
 #: src/pages/providers/saml/SAMLProviderForm.ts
 #: src/pages/sources/saml/SAMLSourceForm.ts
 msgid "Digest algorithm"
@@ -1706,17 +1710,17 @@ msgstr "Tout va bien."
 msgid "Exception"
 msgstr "Exception"
 
-#: src/pages/flows/FlowViewPage.ts
-msgid "Execute"
-msgstr "Exécuter"
+#: 
+#~ msgid "Execute"
+#~ msgstr "Exécuter"
 
 #: src/pages/flows/FlowViewPage.ts
 msgid "Execute flow"
 msgstr "Exécuter le flux"
 
-#: src/pages/flows/FlowViewPage.ts
-msgid "Execute with inspector"
-msgstr "Exécuter avec inspection"
+#: 
+#~ msgid "Execute with inspector"
+#~ msgstr "Exécuter avec inspection"
 
 #: src/pages/policies/expression/ExpressionPolicyForm.ts
 msgid "Executes the python snippet to determine whether to allow or deny a request."
@@ -2944,6 +2948,10 @@ msgstr "Aucun worker connecté. Les tâches de fond ne tourneront pas."
 msgid "None (rule disabled)"
 msgstr "Aucun (règle désactivée)"
 
+#: src/pages/flows/FlowViewPage.ts
+msgid "Normal"
+msgstr ""
+
 #: src/pages/outposts/OutpostHealthSimple.ts
 msgid "Not available"
 msgstr "Indisponible"
@@ -5616,6 +5624,10 @@ msgstr "la référence sera réinitialisée à sa valeur par défaut"
 msgid "reference will be set to an empty value"
 msgstr "la référence sera réinitialisée à une valeur vide"
 
+#: src/pages/flows/FlowViewPage.ts
+msgid "with inspector"
+msgstr ""
+
 #: src/elements/Expand.ts
 #: src/elements/Expand.ts
 msgid "{0}"
diff --git a/web/src/locales/pseudo-LOCALE.po b/web/src/locales/pseudo-LOCALE.po
index 29ee6e1e1..bf8718241 100644
--- a/web/src/locales/pseudo-LOCALE.po
+++ b/web/src/locales/pseudo-LOCALE.po
@@ -1407,6 +1407,10 @@ msgstr ""
 msgid "Device(s)"
 msgstr ""
 
+#: src/pages/flows/FlowViewPage.ts
+msgid "Diagram"
+msgstr ""
+
 #: src/pages/providers/saml/SAMLProviderForm.ts
 #: src/pages/sources/saml/SAMLSourceForm.ts
 msgid "Digest algorithm"
@@ -1712,17 +1716,17 @@ msgstr ""
 msgid "Exception"
 msgstr ""
 
-#: src/pages/flows/FlowViewPage.ts
-msgid "Execute"
-msgstr ""
+#: 
+#~ msgid "Execute"
+#~ msgstr ""
 
 #: src/pages/flows/FlowViewPage.ts
 msgid "Execute flow"
 msgstr ""
 
-#: src/pages/flows/FlowViewPage.ts
-msgid "Execute with inspector"
-msgstr ""
+#: 
+#~ msgid "Execute with inspector"
+#~ msgstr ""
 
 #: src/pages/policies/expression/ExpressionPolicyForm.ts
 msgid "Executes the python snippet to determine whether to allow or deny a request."
@@ -2956,6 +2960,10 @@ msgstr ""
 msgid "None (rule disabled)"
 msgstr ""
 
+#: src/pages/flows/FlowViewPage.ts
+msgid "Normal"
+msgstr ""
+
 #: src/pages/outposts/OutpostHealthSimple.ts
 msgid "Not available"
 msgstr ""
@@ -5664,6 +5672,10 @@ msgstr ""
 msgid "reference will be set to an empty value"
 msgstr ""
 
+#: src/pages/flows/FlowViewPage.ts
+msgid "with inspector"
+msgstr ""
+
 #: src/elements/Expand.ts
 #: src/elements/Expand.ts
 msgid "{0}"
diff --git a/web/src/pages/flows/FlowViewPage.ts b/web/src/pages/flows/FlowViewPage.ts
index cfea02386..a20c45f45 100644
--- a/web/src/pages/flows/FlowViewPage.ts
+++ b/web/src/pages/flows/FlowViewPage.ts
@@ -109,7 +109,7 @@ export class FlowViewPage extends LitElement {
                                                             });
                                                     }}
                                                 >
-                                                    ${t`Execute`}
+                                                    ${t`Normal`}
                                                 </button>
                                                 <button
                                                     class="pf-c-button pf-m-secondary"
@@ -124,7 +124,7 @@ export class FlowViewPage extends LitElement {
                                                             });
                                                     }}
                                                 >
-                                                    ${t`Execute with inspector`}
+                                                    ${t`with inspector`}
                                                 </button>
                                             </div>
                                         </dd>
@@ -150,12 +150,26 @@ export class FlowViewPage extends LitElement {
                         <div
                             class="pf-c-card pf-l-grid__item pf-m-12-col pf-m-10-col-on-xl pf-m-10-col-on-2xl"
                         >
+                            <div class="pf-c-card__title">${t`Diagram`}</div>
                             <div class="pf-c-card">
                                 <div class="pf-c-card__body">
                                     <ak-flow-diagram flowSlug=${this.flow.slug}> </ak-flow-diagram>
                                 </div>
                             </div>
                         </div>
+                        <div
+                            class="pf-c-card pf-l-grid__item pf-m-12-col pf-m-12-col-on-xl pf-m-12-col-on-2xl"
+                        >
+                            <div class="pf-c-card__title">${t`Changelog`}</div>
+                            <div class="pf-c-card__body">
+                                <ak-object-changelog
+                                    targetModelPk=${this.flow.pk || ""}
+                                    targetModelApp="authentik_flows"
+                                    targetModelName="flow"
+                                >
+                                </ak-object-changelog>
+                            </div>
+                        </div>
                     </div>
                 </div>
                 <div
@@ -184,22 +198,6 @@ export class FlowViewPage extends LitElement {
                         </div>
                     </div>
                 </div>
-                <div
-                    slot="page-changelog"
-                    data-tab-title="${t`Changelog`}"
-                    class="pf-c-page__main-section pf-m-no-padding-mobile"
-                >
-                    <div class="pf-c-card">
-                        <div class="pf-c-card__body">
-                            <ak-object-changelog
-                                targetModelPk=${this.flow.pk || ""}
-                                targetModelApp="authentik_flows"
-                                targetModelName="flow"
-                            >
-                            </ak-object-changelog>
-                        </div>
-                    </div>
-                </div>
             </ak-tabs>`;
     }
 }