From 42391301a90e4de9dc5848cd3ffaf94102f8662f Mon Sep 17 00:00:00 2001
From: John Cowen <johncowen@users.noreply.github.com>
Date: Tue, 26 Oct 2021 19:00:32 +0100
Subject: [PATCH] ui: Ensure we provide an id for filtering policy-tokens
 (#11311)

---
 .changelog/11311.txt                                         | 4 ++++
 .../consul-ui/app/templates/dc/acls/policies/edit.hbs        | 5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 .changelog/11311.txt

diff --git a/.changelog/11311.txt b/.changelog/11311.txt
new file mode 100644
index 000000000..32cfae9cf
--- /dev/null
+++ b/.changelog/11311.txt
@@ -0,0 +1,4 @@
+```release-note:bug
+ui: Ensure we filter tokens by policy when showing which tokens use a certain
+policy whilst editing a policy
+```
diff --git a/ui/packages/consul-ui/app/templates/dc/acls/policies/edit.hbs b/ui/packages/consul-ui/app/templates/dc/acls/policies/edit.hbs
index c320385c5..baa753d7e 100644
--- a/ui/packages/consul-ui/app/templates/dc/acls/policies/edit.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/acls/policies/edit.hbs
@@ -29,11 +29,12 @@ as |route|>
   route.params.dc
   route.params.partition
   route.params.nspace
+  (or route.params.id '')
 
   loader.data
   loader.data.isNew
 
-as |dc partition nspace item create|}}
+as |dc partition nspace id item create|}}
   <AppView
     @login={{route.model.app.login.open}}
     >
@@ -104,7 +105,7 @@ as |dc partition nspace item create|}}
           partition=partition
           nspace=nspace
           dc=dc
-          id=(or id '')
+          id=id
         )
       }}
     as |loader|>