From 6458f928b9aef4cb6004cfbaae190fc21d2bdbd9 Mon Sep 17 00:00:00 2001
From: Randall Morey <randall@randallmorey.com>
Date: Tue, 7 Sep 2021 14:20:49 -0400
Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20fix=20lingering=20capabil?=
 =?UTF-8?q?ities=20bugs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scopes/scope/auth-methods/index.hbs       | 52 ++++++++-----------
 .../templates/scopes/scope/scopes/index.hbs   | 12 +++--
 2 files changed, 29 insertions(+), 35 deletions(-)

diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs
index a2f2d0860..500beb452 100644
--- a/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs
@@ -12,28 +12,25 @@
   </page.breadcrumbs>
 
   <page.actions>
-
     {{#if (can 'create collection' this.scopeModel collection='auth-methods')}}
-      {{#if @model}}
-        <Rose::Dropdown
-          @text={{t 'titles.new'}}
-          @dropdownRight={{true}}
-          as |dropdown|
+      <Rose::Dropdown
+        @text={{t 'titles.new'}}
+        @dropdownRight={{true}}
+        as |dropdown|
+      >
+        <dropdown.link
+          @route='scopes.scope.auth-methods.new'
+          @query={{hash type='password'}}
         >
-          <dropdown.link
-            @route='scopes.scope.auth-methods.new'
-            @query={{hash type='password'}}
-          >
-            {{t 'resources.auth-method.types.password'}}
-          </dropdown.link>
-          <dropdown.link
-            @route='scopes.scope.auth-methods.new'
-            @query={{hash type='oidc'}}
-          >
-            {{t 'resources.auth-method.types.oidc'}}
-          </dropdown.link>
-        </Rose::Dropdown>
-      {{/if}}
+          {{t 'resources.auth-method.types.password'}}
+        </dropdown.link>
+        <dropdown.link
+          @route='scopes.scope.auth-methods.new'
+          @query={{hash type='oidc'}}
+        >
+          {{t 'resources.auth-method.types.oidc'}}
+        </dropdown.link>
+      </Rose::Dropdown>
     {{/if}}
   </page.actions>
 
@@ -168,11 +165,13 @@
           as |message|
         >
           <message.description>
-            {{#if (can 'list collection' this.scope collection='auth-methods')}}
+            {{#if
+              (can 'list collection' this.scopeModel collection='auth-methods')
+            }}
               {{! can list (at least):  show default welcome message}}
               {{t 'resources.auth-method.messages.welcome.description'}}
             {{else if (can
-              'create collection' this.scope collection='auth-methods'
+              'create collection' this.scopeModel collection='auth-methods'
             )}}
               {{! can create (only):  show create-but-not-list welcome message}}
               {{t
@@ -187,15 +186,6 @@
               }}
             {{/if}}
           </message.description>
-          {{#if (can 'create collection' this.scope collection='auth-methods')}}
-            <message.link
-              @route='scopes.scope.auth-methods.new'
-              @query={{hash type='password'}}
-            >
-              <Rose::Icon @name='flight-icons/plus-circle-16' />
-              {{t 'titles.new'}}
-            </message.link>
-          {{/if}}
         </Rose::Message>
       </Rose::Layout::Centered>
 
diff --git a/ui/admin/app/templates/scopes/scope/scopes/index.hbs b/ui/admin/app/templates/scopes/scope/scopes/index.hbs
index 18134a990..4194cdc24 100644
--- a/ui/admin/app/templates/scopes/scope/scopes/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/scopes/index.hbs
@@ -67,10 +67,14 @@
             <message.description>
               {{t 'resources.org.description'}}
             </message.description>
-            <message.link @route='scopes.scope.new'>
-              <Rose::Icon @name='flight-icons/plus-circle-16' />
-              {{t 'titles.new'}}
-            </message.link>
+            {{#if
+              (can 'create collection' @model.currentScope collection='scopes')
+            }}
+              <message.link @route='scopes.scope.new'>
+                <Rose::Icon @name='flight-icons/plus-circle-16' />
+                {{t 'titles.new'}}
+              </message.link>
+            {{/if}}
           </Rose::Message>
         </Rose::Layout::Centered>
       {{/if}}