Merge pull request #310 from hashicorp/oss/merge-main-b94f3d164e4c9600e0fd985e45bbf7691d0ca1df

[main] OSS to ENT merge of (b94f3d1)

ui/admin/app/templates/scopes/scope.hbs

@@ -73,24 +73,7 @@
             {{t 'resources.project.title_plural'}}
           </nav.link>
         </Rose::Nav::Sidebar>
-        {{! TODO:  after scope awareness refactor, update groups and roles
-                     to support project scopes }}
-        {{!--
-        <Rose::Nav::Sidebar @title={{t "titles.iam"}} as |nav|>
-          <nav.link @route="scopes.scope.groups">
-            <Rose::Icon
-              @name="flight-icons/svg/folder-users-16"
-              @size="medium" />
-            {{t "resources.group.title_plural"}}
-          </nav.link>
-          <nav.link @route="scopes.scope.roles">
-            <Rose::Icon
-              @name="flight-icons/svg/identity-user-16"
-              @size="medium" />
-            {{t "resources.role.title_plural"}}
-          </nav.link>
-        </Rose::Nav::Sidebar>
-        --}}
+
         <Rose::Nav::Sidebar @title={{t 'titles.resources'}} as |nav|>
           {{#if (can 'navigate model' @model collection='sessions')}}
             <nav.link @route='scopes.scope.sessions'>