From 3c23ad340fc4959d6dbc2f0b5ebc57783e61066d Mon Sep 17 00:00:00 2001
From: Jens Langhammer <jens.langhammer@beryju.org>
Date: Thu, 13 May 2021 18:01:40 +0200
Subject: [PATCH] web/admin: improve diagram api for flows

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
---
 authentik/flows/api/flows.py        |  1 +
 web/src/pages/flows/FlowViewPage.ts | 16 ++++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/authentik/flows/api/flows.py b/authentik/flows/api/flows.py
index 469c78306..7fddfc3c5 100644
--- a/authentik/flows/api/flows.py
+++ b/authentik/flows/api/flows.py
@@ -210,6 +210,7 @@ class FlowViewSet(ModelViewSet):
                     request.user, "authentik_policies.view_policybinding"
                 )
                 .filter(target=stage_binding)
+                .exclude(policy__isnull=True)
                 .order_by("order")
             ):
                 body.append(
diff --git a/web/src/pages/flows/FlowViewPage.ts b/web/src/pages/flows/FlowViewPage.ts
index af1e12a28..1d4a68327 100644
--- a/web/src/pages/flows/FlowViewPage.ts
+++ b/web/src/pages/flows/FlowViewPage.ts
@@ -58,14 +58,6 @@ export class FlowViewPage extends LitElement {
             <ak-tabs>
                 <div slot="page-overview" data-tab-title="${t`Flow Overview`}" class="pf-c-page__main-section pf-m-no-padding-mobile">
                     <div class="pf-l-gallery pf-m-gutter">
-                        <div class="pf-c-card pf-l-gallery__item" style="grid-column-end: span 4;grid-row-end: span 2;">
-                            <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-gallery__item">
                             <div class="pf-c-card__title">${t`Related`}</div>
                             <div class="pf-c-card__body">
@@ -94,6 +86,14 @@ export class FlowViewPage extends LitElement {
                                 </dl>
                             </div>
                         </div>
+                        <div class="pf-c-card pf-l-gallery__item" style="grid-column-end: span 4;grid-row-end: span 2;">
+                            <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>
                 </div>
                 <div slot="page-stage-bindings" data-tab-title="${t`Stage Bindings`}" class="pf-c-page__main-section pf-m-no-padding-mobile">