Merge branch 'main' of https://github.com/hashicorp/boundary-ui-enterprise into session-recording

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

@@ -85,24 +85,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'>

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

@@ -95,7 +95,6 @@
           <header.row as |row|>
             <row.headerCell>{{t 'resources.worker.title'}}</row.headerCell>
             <row.headerCell>{{t 'form.id.label'}}</row.headerCell>
-            <row.headerCell>{{t 'form.type.label'}}</row.headerCell>
             <row.headerCell>{{t
                 'resources.worker.table.session_count'
               }}</row.headerCell>
@@ -143,9 +142,8 @@
                   @acknowledgeText={{t 'states.copied'}}
                 >
                   <code>{{worker.id}}</code>
-                </Copyable></row.cell>
-
-              <row.cell>{{worker.type}}</row.cell>
+                </Copyable>
+              </row.cell>
               <row.cell>{{worker.active_connection_count}}</row.cell>
               <row.cell>{{worker.release_version}}</row.cell>
               <row.cell>{{worker.address}} </row.cell>