From 41b3a996171542eb53db507977dfc068cc108f77 Mon Sep 17 00:00:00 2001
From: Randall Morey <randall@randallmorey.com>
Date: Tue, 25 Jan 2022 09:13:09 -0500
Subject: [PATCH 1/3] =?UTF-8?q?refactor:=20=F0=9F=92=A1=20remove=20renderT?=
 =?UTF-8?q?emplate=20usage=20from=20roles=20resource?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../roles/role/actions/index.hbs}             |   0
 .../roles/role/header/index.hbs}              |   0
 .../roles/role/nav/index.hbs}                 |   0
 .../app/routes/scopes/scope/roles/role.js     |  24 ---
 .../scopes/scope/roles/role/add-principals.js |  24 ---
 .../routes/scopes/scope/roles/role/grants.js  |  16 --
 .../scopes/scope/roles/role/principals.js     |  14 --
 .../app/templates/scopes/scope/roles/role.hbs |  24 +--
 .../scope/roles/role/add-principals.hbs       |  32 +++-
 .../roles/role/add-principals/-header.hbs     |   5 -
 .../scopes/scope/roles/role/grants.hbs        |  47 ++++-
 .../scope/roles/role/grants/-header.hbs       |  12 --
 .../scopes/scope/roles/role/index.hbs         |  34 +++-
 .../scopes/scope/roles/role/principals.hbs    | 180 +++++++++++-------
 .../scope/roles/role/principals/-header.hbs   |  12 --
 15 files changed, 201 insertions(+), 223 deletions(-)
 rename ui/admin/app/{templates/scopes/scope/roles/role/-actions.hbs => components/roles/role/actions/index.hbs} (100%)
 rename ui/admin/app/{templates/scopes/scope/roles/role/-header.hbs => components/roles/role/header/index.hbs} (100%)
 rename ui/admin/app/{templates/scopes/scope/roles/role/-navigation.hbs => components/roles/role/nav/index.hbs} (100%)
 delete mode 100644 ui/admin/app/templates/scopes/scope/roles/role/add-principals/-header.hbs
 delete mode 100644 ui/admin/app/templates/scopes/scope/roles/role/grants/-header.hbs
 delete mode 100644 ui/admin/app/templates/scopes/scope/roles/role/principals/-header.hbs

diff --git a/ui/admin/app/templates/scopes/scope/roles/role/-actions.hbs b/ui/admin/app/components/roles/role/actions/index.hbs
similarity index 100%
rename from ui/admin/app/templates/scopes/scope/roles/role/-actions.hbs
rename to ui/admin/app/components/roles/role/actions/index.hbs
diff --git a/ui/admin/app/templates/scopes/scope/roles/role/-header.hbs b/ui/admin/app/components/roles/role/header/index.hbs
similarity index 100%
rename from ui/admin/app/templates/scopes/scope/roles/role/-header.hbs
rename to ui/admin/app/components/roles/role/header/index.hbs
diff --git a/ui/admin/app/templates/scopes/scope/roles/role/-navigation.hbs b/ui/admin/app/components/roles/role/nav/index.hbs
similarity index 100%
rename from ui/admin/app/templates/scopes/scope/roles/role/-navigation.hbs
rename to ui/admin/app/components/roles/role/nav/index.hbs
diff --git a/ui/admin/app/routes/scopes/scope/roles/role.js b/ui/admin/app/routes/scopes/scope/roles/role.js
index 23ff8220c..54c98ec4c 100644
--- a/ui/admin/app/routes/scopes/scope/roles/role.js
+++ b/ui/admin/app/routes/scopes/scope/roles/role.js
@@ -16,28 +16,4 @@ export default class ScopesScopeRolesRoleRoute extends Route {
       adapterOptions: { scopeID },
     });
   }
-
-  /**
-   * Renders the role specific templates for header, navigation,
-   * and actions page sections.
-   * @override
-   */
-  renderTemplate() {
-    super.renderTemplate(...arguments);
-
-    this.render('scopes/scope/roles/role/-header', {
-      into: 'scopes/scope/roles/role',
-      outlet: 'header',
-    });
-
-    this.render('scopes/scope/roles/role/-navigation', {
-      into: 'scopes/scope/roles/role',
-      outlet: 'navigation',
-    });
-
-    this.render('scopes/scope/roles/role/-actions', {
-      into: 'scopes/scope/roles/role',
-      outlet: 'actions',
-    });
-  }
 }
diff --git a/ui/admin/app/routes/scopes/scope/roles/role/add-principals.js b/ui/admin/app/routes/scopes/scope/roles/role/add-principals.js
index c6dcf8b50..1d29243d7 100644
--- a/ui/admin/app/routes/scopes/scope/roles/role/add-principals.js
+++ b/ui/admin/app/routes/scopes/scope/roles/role/add-principals.js
@@ -28,30 +28,6 @@ export default class ScopesScopeRolesRoleAddPrincipalsRoute extends Route {
     });
   }
 
-  /**
-   * Renders the add-principals-specific header template.
-   * Empties the actions and navigation outlets and renders a custom empty header.
-   * @override
-   */
-  renderTemplate() {
-    super.renderTemplate(...arguments);
-
-    this.render('scopes/scope/roles/role/add-principals/-header', {
-      into: 'scopes/scope/roles/role',
-      outlet: 'header',
-    });
-
-    this.render('-empty', {
-      into: 'scopes/scope/roles/role',
-      outlet: 'navigation',
-    });
-
-    this.render('-empty', {
-      into: 'scopes/scope/roles/role',
-      outlet: 'actions',
-    });
-  }
-
   // =actions
 
   /**
diff --git a/ui/admin/app/routes/scopes/scope/roles/role/grants.js b/ui/admin/app/routes/scopes/scope/roles/role/grants.js
index 11cfa1516..76d7c7ef3 100644
--- a/ui/admin/app/routes/scopes/scope/roles/role/grants.js
+++ b/ui/admin/app/routes/scopes/scope/roles/role/grants.js
@@ -10,22 +10,6 @@ export default class ScopesScopeRolesRoleGrantsRoute extends Route {
   @service intl;
   @service notify;
 
-  // =methods
-
-  /**
-   * Renders the grants-specific header template.
-   * Empties the actions and navigation outlets and renders a custom empty header.
-   * @override
-   */
-  renderTemplate() {
-    super.renderTemplate(...arguments);
-
-    this.render('scopes/scope/roles/role/grants/-header', {
-      into: 'scopes/scope/roles/role',
-      outlet: 'header',
-    });
-  }
-
   // =actions
 
   /**
diff --git a/ui/admin/app/routes/scopes/scope/roles/role/principals.js b/ui/admin/app/routes/scopes/scope/roles/role/principals.js
index 6c3b38925..17172e0f8 100644
--- a/ui/admin/app/routes/scopes/scope/roles/role/principals.js
+++ b/ui/admin/app/routes/scopes/scope/roles/role/principals.js
@@ -45,20 +45,6 @@ export default class ScopesScopeRolesRolePrincipalsRoute extends Route {
     });
   }
 
-  /**
-   * Renders the principals-specific header template.
-   * Empties the actions and navigation outlets and renders a custom empty header.
-   * @override
-   */
-  renderTemplate() {
-    super.renderTemplate(...arguments);
-
-    this.render('scopes/scope/roles/role/principals/-header', {
-      into: 'scopes/scope/roles/role',
-      outlet: 'header',
-    });
-  }
-
   // =actions
 
   /**
diff --git a/ui/admin/app/templates/scopes/scope/roles/role.hbs b/ui/admin/app/templates/scopes/scope/roles/role.hbs
index 33d5e4cdc..7d32ecb0d 100644
--- a/ui/admin/app/templates/scopes/scope/roles/role.hbs
+++ b/ui/admin/app/templates/scopes/scope/roles/role.hbs
@@ -1,25 +1,3 @@
 {{page-title @model.displayName}}
 
-<Rose::Layout::Page as |page|>
-
-  <page.breadcrumbs>
-    <BreadCrumbs />
-  </page.breadcrumbs>
-
-  <page.header>
-    {{outlet 'header'}}
-  </page.header>
-
-  <page.actions>
-    {{outlet 'actions'}}
-  </page.actions>
-
-  <page.navigation>
-    {{outlet 'navigation'}}
-  </page.navigation>
-
-  <page.body>
-    {{outlet}}
-  </page.body>
-
-</Rose::Layout::Page>
\ No newline at end of file
+{{outlet}}
\ No newline at end of file
diff --git a/ui/admin/app/templates/scopes/scope/roles/role/add-principals.hbs b/ui/admin/app/templates/scopes/scope/roles/role/add-principals.hbs
index 059142299..c454c543a 100644
--- a/ui/admin/app/templates/scopes/scope/roles/role/add-principals.hbs
+++ b/ui/admin/app/templates/scopes/scope/roles/role/add-principals.hbs
@@ -1,9 +1,27 @@
 {{page-title (t 'resources.role.principal.actions.add-principals')}}
 
-<Form::Role::AddPrincipals
-  @model={{@model.role}}
-  @users={{@model.users}}
-  @groups={{@model.groups}}
-  @submit={{route-action 'addPrincipals' @model.role}}
-  @cancel={{route-action 'cancel'}}
-/>
\ No newline at end of file
+<Rose::Layout::Page as |page|>
+
+  <page.breadcrumbs>
+    <BreadCrumbs />
+  </page.breadcrumbs>
+
+  <page.header>
+    <h2>
+      {{t 'resources.role.principal.messages.add-principals.title'}}
+      <DocLink @doc='role.add-principals' @iconSize='large' />
+    </h2>
+    <p>{{t 'resources.role.principal.messages.add-principals.description'}}</p>
+  </page.header>
+
+  <page.body>
+    <Form::Role::AddPrincipals
+      @model={{@model.role}}
+      @users={{@model.users}}
+      @groups={{@model.groups}}
+      @submit={{route-action 'addPrincipals' @model.role}}
+      @cancel={{route-action 'cancel'}}
+    />
+  </page.body>
+
+</Rose::Layout::Page>
\ No newline at end of file
diff --git a/ui/admin/app/templates/scopes/scope/roles/role/add-principals/-header.hbs b/ui/admin/app/templates/scopes/scope/roles/role/add-principals/-header.hbs
deleted file mode 100644
index 8264b0ae5..000000000
--- a/ui/admin/app/templates/scopes/scope/roles/role/add-principals/-header.hbs
+++ /dev/null
@@ -1,5 +0,0 @@
-<h2>
-  {{t 'resources.role.principal.messages.add-principals.title'}}
-  <DocLink @doc='role.add-principals' @iconSize='large' />
-</h2>
-<p>{{t 'resources.role.principal.messages.add-principals.description'}}</p>
\ No newline at end of file
diff --git a/ui/admin/app/templates/scopes/scope/roles/role/grants.hbs b/ui/admin/app/templates/scopes/scope/roles/role/grants.hbs
index 79ccf9ede..a93aaacf7 100644
--- a/ui/admin/app/templates/scopes/scope/roles/role/grants.hbs
+++ b/ui/admin/app/templates/scopes/scope/roles/role/grants.hbs
@@ -1,9 +1,42 @@
 {{page-title (t 'resources.role.grant.title_plural')}}
 
-<Form::Role::Grants
-  @model={{@model}}
-  @submit={{route-action 'save' @model}}
-  @cancel={{route-action 'cancel' @model}}
-  @addGrant={{route-action 'addGrant' @model}}
-  @removeGrant={{route-action 'removeGrant' @model}}
-/>
\ No newline at end of file
+<Rose::Layout::Page as |page|>
+
+  <page.breadcrumbs>
+    <BreadCrumbs />
+  </page.breadcrumbs>
+
+  <page.header>
+    <h2>
+      {{t 'resources.role.title'}}
+      <DocLink @doc='role' @iconSize='large' />
+    </h2>
+    <p>{{t 'resources.role.grant.description'}}</p>
+    <Copyable
+      @text={{@model.id}}
+      @buttonText={{t 'actions.copy-to-clipboard'}}
+      @acknowledgeText={{t 'states.copied'}}
+    >
+      <code>{{@model.id}}</code>
+    </Copyable>
+  </page.header>
+
+  <page.actions>
+    <Roles::Role::Actions @model={{@model}} />
+  </page.actions>
+
+  <page.navigation>
+    <Roles::Role::Nav @model={{@model}} />
+  </page.navigation>
+
+  <page.body>
+    <Form::Role::Grants
+      @model={{@model}}
+      @submit={{route-action 'save' @model}}
+      @cancel={{route-action 'cancel' @model}}
+      @addGrant={{route-action 'addGrant' @model}}
+      @removeGrant={{route-action 'removeGrant' @model}}
+    />
+  </page.body>
+
+</Rose::Layout::Page>
\ No newline at end of file
diff --git a/ui/admin/app/templates/scopes/scope/roles/role/grants/-header.hbs b/ui/admin/app/templates/scopes/scope/roles/role/grants/-header.hbs
deleted file mode 100644
index 4097a2ecf..000000000
--- a/ui/admin/app/templates/scopes/scope/roles/role/grants/-header.hbs
+++ /dev/null
@@ -1,12 +0,0 @@
-<h2>
-  {{t 'resources.role.title'}}
-  <DocLink @doc='role' @iconSize='large' />
-</h2>
-<p>{{t 'resources.role.grant.description'}}</p>
-<Copyable
-  @text={{@model.id}}
-  @buttonText={{t 'actions.copy-to-clipboard'}}
-  @acknowledgeText={{t 'states.copied'}}
->
-  <code>{{@model.id}}</code>
-</Copyable>
\ No newline at end of file
diff --git a/ui/admin/app/templates/scopes/scope/roles/role/index.hbs b/ui/admin/app/templates/scopes/scope/roles/role/index.hbs
index 99dc29cc6..8edae91b9 100644
--- a/ui/admin/app/templates/scopes/scope/roles/role/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/roles/role/index.hbs
@@ -1,6 +1,28 @@
-<Form::Role
-  @model={{@model}}
-  @grantScopes={{this.grantScopes}}
-  @submit={{route-action 'save' @model}}
-  @cancel={{route-action 'cancel' @model}}
-/>
\ No newline at end of file
+<Rose::Layout::Page as |page|>
+
+  <page.breadcrumbs>
+    <BreadCrumbs />
+  </page.breadcrumbs>
+
+  <page.header>
+    <Roles::Role::Header @model={{@model}} />
+  </page.header>
+
+  <page.actions>
+    <Roles::Role::Actions @model={{@model}} />
+  </page.actions>
+
+  <page.navigation>
+    <Roles::Role::Nav @model={{@model}} />
+  </page.navigation>
+
+  <page.body>
+    <Form::Role
+      @model={{@model}}
+      @grantScopes={{this.grantScopes}}
+      @submit={{route-action 'save' @model}}
+      @cancel={{route-action 'cancel' @model}}
+    />
+  </page.body>
+
+</Rose::Layout::Page>
\ No newline at end of file
diff --git a/ui/admin/app/templates/scopes/scope/roles/role/principals.hbs b/ui/admin/app/templates/scopes/scope/roles/role/principals.hbs
index 567a95200..0dd8125f2 100644
--- a/ui/admin/app/templates/scopes/scope/roles/role/principals.hbs
+++ b/ui/admin/app/templates/scopes/scope/roles/role/principals.hbs
@@ -1,79 +1,113 @@
 {{page-title (t 'resources.role.principal.title_plural')}}
 
-{{#if @model.principals}}
+<Rose::Layout::Page as |page|>
 
-  <Rose::Table as |table|>
-    <table.header as |header|>
-      <header.row as |row|>
-        <row.headerCell>{{t 'form.name.label'}}</row.headerCell>
-        <row.headerCell>{{t 'form.type.label'}}</row.headerCell>
-        <row.headerCell>{{t 'form.id.label'}}</row.headerCell>
-        <row.headerCell>{{t 'titles.actions'}}</row.headerCell>
-      </header.row>
-    </table.header>
-    <table.body as |body|>
-      {{#each @model.principals as |principal|}}
-        <body.row as |row|>
-          <row.headerCell>
-            {{principal.model.displayName}}
-            {{#if principal.model.accountName}}
-              <br /><Rose::Badge>{{principal.model.accountName}}</Rose::Badge>
-            {{/if}}
-          </row.headerCell>
-          <row.cell>
-            {{t (concat 'resources.role.principal.types.' principal.type)}}
-          </row.cell>
-          <row.cell>
-            <Copyable
-              @text={{principal.model.id}}
-              @buttonText={{t 'actions.copy-to-clipboard'}}
-              @acknowledgeText={{t 'states.copied'}}
-            >
-              <code>{{principal.model.id}}</code>
-            </Copyable>
-          </row.cell>
-          <row.cell>
-            {{#if (can 'removePrincipals role' @model.role)}}
-              <Rose::Dropdown
-                @icon='flight-icons/svg/more-horizontal-16'
-                @iconOnly={{true}}
-                @showCaret={{false}}
-                @dropdownRight={{true}}
-                @text='{{t 'actions.manage'}}'
-                as |dropdown|
-              >
-                <dropdown.button
-                  @style='danger'
-                  {{on
-                    'click'
-                    (route-action 'removePrincipal' principal.model)
-                  }}
-                >
-                  {{t 'actions.remove'}}
-                </dropdown.button>
-              </Rose::Dropdown>
-            {{/if}}
-          </row.cell>
-        </body.row>
-      {{/each}}
-    </table.body>
-  </Rose::Table>
+  <page.breadcrumbs>
+    <BreadCrumbs />
+  </page.breadcrumbs>
 
-{{else}}
-
-  <Rose::Layout::Centered>
-    <Rose::Message
-      @title={{t 'resources.role.principal.messages.welcome.title'}}
-      as |message|
+  <page.header>
+    <h2>
+      {{t 'resources.role.title'}}
+      <DocLink @doc='role' @iconSize='large' />
+    </h2>
+    <p>{{t 'resources.role.principal.description'}}</p>
+    <Copyable
+      @text={{@model.role.id}}
+      @buttonText={{t 'actions.copy-to-clipboard'}}
+      @acknowledgeText={{t 'states.copied'}}
     >
-      <message.description>
-        {{t 'resources.role.principal.messages.welcome.description'}}
-      </message.description>
-      <message.link @route='scopes.scope.roles.role.add-principals'>
-        <Rose::Icon @name='flight-icons/svg/plus-circle-16' />
-        {{t 'resources.role.principal.actions.add-principals'}}
-      </message.link>
-    </Rose::Message>
-  </Rose::Layout::Centered>
+      <code>{{@model.role.id}}</code>
+    </Copyable>
+  </page.header>
 
-{{/if}}
\ No newline at end of file
+  <page.actions>
+    <Roles::Role::Actions @model={{@model.role}} />
+  </page.actions>
+
+  <page.navigation>
+    <Roles::Role::Nav @model={{@model.role}} />
+  </page.navigation>
+
+  <page.body>
+    {{#if @model.principals}}
+
+      <Rose::Table as |table|>
+        <table.header as |header|>
+          <header.row as |row|>
+            <row.headerCell>{{t 'form.name.label'}}</row.headerCell>
+            <row.headerCell>{{t 'form.type.label'}}</row.headerCell>
+            <row.headerCell>{{t 'form.id.label'}}</row.headerCell>
+            <row.headerCell>{{t 'titles.actions'}}</row.headerCell>
+          </header.row>
+        </table.header>
+        <table.body as |body|>
+          {{#each @model.principals as |principal|}}
+            <body.row as |row|>
+              <row.headerCell>
+                {{principal.model.displayName}}
+                {{#if principal.model.accountName}}
+                  <br /><Rose::Badge
+                  >{{principal.model.accountName}}</Rose::Badge>
+                {{/if}}
+              </row.headerCell>
+              <row.cell>
+                {{t (concat 'resources.role.principal.types.' principal.type)}}
+              </row.cell>
+              <row.cell>
+                <Copyable
+                  @text={{principal.model.id}}
+                  @buttonText={{t 'actions.copy-to-clipboard'}}
+                  @acknowledgeText={{t 'states.copied'}}
+                >
+                  <code>{{principal.model.id}}</code>
+                </Copyable>
+              </row.cell>
+              <row.cell>
+                {{#if (can 'removePrincipals role' @model.role)}}
+                  <Rose::Dropdown
+                    @icon='flight-icons/svg/more-horizontal-16'
+                    @iconOnly={{true}}
+                    @showCaret={{false}}
+                    @dropdownRight={{true}}
+                    @text='{{t 'actions.manage'}}'
+                    as |dropdown|
+                  >
+                    <dropdown.button
+                      @style='danger'
+                      {{on
+                        'click'
+                        (route-action 'removePrincipal' principal.model)
+                      }}
+                    >
+                      {{t 'actions.remove'}}
+                    </dropdown.button>
+                  </Rose::Dropdown>
+                {{/if}}
+              </row.cell>
+            </body.row>
+          {{/each}}
+        </table.body>
+      </Rose::Table>
+
+    {{else}}
+
+      <Rose::Layout::Centered>
+        <Rose::Message
+          @title={{t 'resources.role.principal.messages.welcome.title'}}
+          as |message|
+        >
+          <message.description>
+            {{t 'resources.role.principal.messages.welcome.description'}}
+          </message.description>
+          <message.link @route='scopes.scope.roles.role.add-principals'>
+            <Rose::Icon @name='flight-icons/svg/plus-circle-16' />
+            {{t 'resources.role.principal.actions.add-principals'}}
+          </message.link>
+        </Rose::Message>
+      </Rose::Layout::Centered>
+
+    {{/if}}
+  </page.body>
+
+</Rose::Layout::Page>
\ No newline at end of file
diff --git a/ui/admin/app/templates/scopes/scope/roles/role/principals/-header.hbs b/ui/admin/app/templates/scopes/scope/roles/role/principals/-header.hbs
deleted file mode 100644
index 3f483d4d2..000000000
--- a/ui/admin/app/templates/scopes/scope/roles/role/principals/-header.hbs
+++ /dev/null
@@ -1,12 +0,0 @@
-<h2>
-  {{t 'resources.role.title'}}
-  <DocLink @doc='role' @iconSize='large' />
-</h2>
-<p>{{t 'resources.role.principal.description'}}</p>
-<Copyable
-  @text={{@model.role.id}}
-  @buttonText={{t 'actions.copy-to-clipboard'}}
-  @acknowledgeText={{t 'states.copied'}}
->
-  <code>{{@model.role.id}}</code>
-</Copyable>
\ No newline at end of file

From 2febf3ac3c3f44f432ab6e119281be024693c40d Mon Sep 17 00:00:00 2001
From: Randall Morey <randall@randallmorey.com>
Date: Tue, 25 Jan 2022 09:40:30 -0500
Subject: [PATCH 2/3] =?UTF-8?q?refactor:=20=F0=9F=92=A1=20remove=20renderT?=
 =?UTF-8?q?emplate=20usage=20from=20groups=20resource?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../groups/group/actions/index.hbs}           |   0
 .../groups/group/header/index.hbs}            |   0
 .../groups/group/nav/index.hbs}               |   0
 .../app/routes/scopes/scope/groups/group.js   |  23 ---
 .../scopes/scope/groups/group/add-members.js  |  23 ---
 .../templates/scopes/scope/groups/group.hbs   |  24 +--
 .../scopes/scope/groups/group/add-members.hbs |  30 +++-
 .../groups/group/add-members/-header.hbs      |   5 -
 .../scopes/scope/groups/group/index.hbs       |  32 +++-
 .../scopes/scope/groups/group/members.hbs     | 158 ++++++++++--------
 10 files changed, 142 insertions(+), 153 deletions(-)
 rename ui/admin/app/{templates/scopes/scope/groups/group/-actions.hbs => components/groups/group/actions/index.hbs} (100%)
 rename ui/admin/app/{templates/scopes/scope/groups/group/-header.hbs => components/groups/group/header/index.hbs} (100%)
 rename ui/admin/app/{templates/scopes/scope/groups/group/-navigation.hbs => components/groups/group/nav/index.hbs} (100%)
 delete mode 100644 ui/admin/app/templates/scopes/scope/groups/group/add-members/-header.hbs

diff --git a/ui/admin/app/templates/scopes/scope/groups/group/-actions.hbs b/ui/admin/app/components/groups/group/actions/index.hbs
similarity index 100%
rename from ui/admin/app/templates/scopes/scope/groups/group/-actions.hbs
rename to ui/admin/app/components/groups/group/actions/index.hbs
diff --git a/ui/admin/app/templates/scopes/scope/groups/group/-header.hbs b/ui/admin/app/components/groups/group/header/index.hbs
similarity index 100%
rename from ui/admin/app/templates/scopes/scope/groups/group/-header.hbs
rename to ui/admin/app/components/groups/group/header/index.hbs
diff --git a/ui/admin/app/templates/scopes/scope/groups/group/-navigation.hbs b/ui/admin/app/components/groups/group/nav/index.hbs
similarity index 100%
rename from ui/admin/app/templates/scopes/scope/groups/group/-navigation.hbs
rename to ui/admin/app/components/groups/group/nav/index.hbs
diff --git a/ui/admin/app/routes/scopes/scope/groups/group.js b/ui/admin/app/routes/scopes/scope/groups/group.js
index 0d9ad56bf..75a1c70d2 100644
--- a/ui/admin/app/routes/scopes/scope/groups/group.js
+++ b/ui/admin/app/routes/scopes/scope/groups/group.js
@@ -12,27 +12,4 @@ export default class ScopesScopeGroupsGroupRoute extends Route {
   model({ group_id }) {
     return this.store.findRecord('group', group_id, { reload: true });
   }
-
-  /**
-   * Renders the route-set specific page sections
-   * @override
-   */
-  renderTemplate() {
-    super.renderTemplate(...arguments);
-
-    this.render('scopes/scope/groups/group/-header', {
-      into: 'scopes/scope/groups/group',
-      outlet: 'header',
-    });
-
-    this.render('scopes/scope/groups/group/-actions', {
-      into: 'scopes/scope/groups/group',
-      outlet: 'actions',
-    });
-
-    this.render('scopes/scope/groups/group/-navigation', {
-      into: 'scopes/scope/groups/group',
-      outlet: 'navigation',
-    });
-  }
 }
diff --git a/ui/admin/app/routes/scopes/scope/groups/group/add-members.js b/ui/admin/app/routes/scopes/scope/groups/group/add-members.js
index fda2aaaed..7629c17d9 100644
--- a/ui/admin/app/routes/scopes/scope/groups/group/add-members.js
+++ b/ui/admin/app/routes/scopes/scope/groups/group/add-members.js
@@ -34,29 +34,6 @@ export default class ScopesScopeGroupsGroupAddMembersRoute extends Route {
     });
   }
 
-  /**
-   * Renders the route-set specific page sections
-   * @override
-   */
-  renderTemplate() {
-    super.renderTemplate(...arguments);
-
-    this.render('scopes/scope/groups/group/add-members/-header', {
-      into: 'scopes/scope/groups/group',
-      outlet: 'header',
-    });
-
-    this.render('-empty', {
-      into: 'scopes/scope/groups/group',
-      outlet: 'actions',
-    });
-
-    this.render('-empty', {
-      into: 'scopes/scope/groups/group',
-      outlet: 'navigation',
-    });
-  }
-
   // =actions
 
   /**
diff --git a/ui/admin/app/templates/scopes/scope/groups/group.hbs b/ui/admin/app/templates/scopes/scope/groups/group.hbs
index 837d1f984..7d32ecb0d 100644
--- a/ui/admin/app/templates/scopes/scope/groups/group.hbs
+++ b/ui/admin/app/templates/scopes/scope/groups/group.hbs
@@ -1,25 +1,3 @@
 {{page-title @model.displayName}}
 
-<Rose::Layout::Page as |page|>
-
-  <page.breadcrumbs>
-    <BreadCrumbs />
-  </page.breadcrumbs>
-
-  <page.header>
-    {{outlet 'header'}}
-  </page.header>
-
-  <page.navigation>
-    {{outlet 'navigation'}}
-  </page.navigation>
-
-  <page.actions>
-    {{outlet 'actions'}}
-  </page.actions>
-
-  <page.body>
-    {{outlet}}
-  </page.body>
-
-</Rose::Layout::Page>
\ No newline at end of file
+{{outlet}}
\ No newline at end of file
diff --git a/ui/admin/app/templates/scopes/scope/groups/group/add-members.hbs b/ui/admin/app/templates/scopes/scope/groups/group/add-members.hbs
index a85c01185..3013ba2f7 100644
--- a/ui/admin/app/templates/scopes/scope/groups/group/add-members.hbs
+++ b/ui/admin/app/templates/scopes/scope/groups/group/add-members.hbs
@@ -1,8 +1,26 @@
 {{page-title (t 'resources.group.messages.add-members.title')}}
 
-<Form::Group::AddMembers
-  @model={{@model.group}}
-  @users={{@model.users}}
-  @submit={{route-action 'addMembers' @model.group}}
-  @cancel={{route-action 'cancel'}}
-/>
\ No newline at end of file
+<Rose::Layout::Page as |page|>
+
+  <page.breadcrumbs>
+    <BreadCrumbs />
+  </page.breadcrumbs>
+
+  <page.header>
+    <h2>
+      {{t 'resources.group.messages.add-members.title'}}
+      <DocLink @doc='group.add-members' @iconSize='large' />
+    </h2>
+    <p>{{t 'resources.group.messages.add-members.description'}}</p>
+  </page.header>
+
+  <page.body>
+    <Form::Group::AddMembers
+      @model={{@model.group}}
+      @users={{@model.users}}
+      @submit={{route-action 'addMembers' @model.group}}
+      @cancel={{route-action 'cancel'}}
+    />
+  </page.body>
+
+</Rose::Layout::Page>
\ No newline at end of file
diff --git a/ui/admin/app/templates/scopes/scope/groups/group/add-members/-header.hbs b/ui/admin/app/templates/scopes/scope/groups/group/add-members/-header.hbs
deleted file mode 100644
index 71181a8df..000000000
--- a/ui/admin/app/templates/scopes/scope/groups/group/add-members/-header.hbs
+++ /dev/null
@@ -1,5 +0,0 @@
-<h2>
-  {{t 'resources.group.messages.add-members.title'}}
-  <DocLink @doc='group.add-members' @iconSize='large' />
-</h2>
-<p>{{t 'resources.group.messages.add-members.description'}}</p>
\ No newline at end of file
diff --git a/ui/admin/app/templates/scopes/scope/groups/group/index.hbs b/ui/admin/app/templates/scopes/scope/groups/group/index.hbs
index 6a89a496d..d5da2abf3 100644
--- a/ui/admin/app/templates/scopes/scope/groups/group/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/groups/group/index.hbs
@@ -1,5 +1,27 @@
-<Form::Group
-  @model={{@model}}
-  @submit={{route-action 'save' @model}}
-  @cancel={{route-action 'cancel' @model}}
-/>
\ No newline at end of file
+<Rose::Layout::Page as |page|>
+
+  <page.breadcrumbs>
+    <BreadCrumbs />
+  </page.breadcrumbs>
+
+  <page.header>
+    <Groups::Group::Header @model={{@model}} />
+  </page.header>
+
+  <page.navigation>
+    <Groups::Group::Nav @model={{@model}} />
+  </page.navigation>
+
+  <page.actions>
+    <Groups::Group::Actions @model={{@model}} />
+  </page.actions>
+
+  <page.body>
+    <Form::Group
+      @model={{@model}}
+      @submit={{route-action 'save' @model}}
+      @cancel={{route-action 'cancel' @model}}
+    />
+  </page.body>
+
+</Rose::Layout::Page>
\ No newline at end of file
diff --git a/ui/admin/app/templates/scopes/scope/groups/group/members.hbs b/ui/admin/app/templates/scopes/scope/groups/group/members.hbs
index 9df657c32..b4c479eda 100644
--- a/ui/admin/app/templates/scopes/scope/groups/group/members.hbs
+++ b/ui/admin/app/templates/scopes/scope/groups/group/members.hbs
@@ -1,75 +1,97 @@
 {{page-title (t 'resources.group.messages.members.title')}}
 
-{{#if @model.members}}
+<Rose::Layout::Page as |page|>
 
-  <Rose::Table as |table|>
-    <table.header as |header|>
-      <header.row as |row|>
-        <row.headerCell>{{t 'form.name.label'}}</row.headerCell>
-        <row.headerCell>{{t 'form.id.label'}}</row.headerCell>
-        <row.headerCell>{{t 'titles.actions'}}</row.headerCell>
-      </header.row>
-    </table.header>
-    <table.body as |body|>
-      {{#each @model.members as |member|}}
-        <body.row as |row|>
-          <row.headerCell>
-            {{member.displayName}}
-            {{#if member.accountName}}
-              <br /><Rose::Badge>{{member.accountName}}</Rose::Badge>
-            {{/if}}
-          </row.headerCell>
-          <row.cell>
-            <Copyable
-              @text={{member.id}}
-              @buttonText={{t 'actions.copy-to-clipboard'}}
-              @acknowledgeText={{t 'states.copied'}}
-            >
-              <code>{{member.id}}</code>
-            </Copyable>
-          </row.cell>
-          <row.cell>
-            {{#if (can 'removeMembers group' @model.group)}}
-              <Rose::Dropdown
-                @icon='flight-icons/svg/more-horizontal-16'
-                @iconOnly={{true}}
-                @showCaret={{false}}
-                @dropdownRight={{true}}
-                @text='{{t 'actions.manage'}}'
-                as |dropdown|
-              >
-                <dropdown.button
-                  @style='danger'
-                  {{on
-                    'click'
-                    (route-action 'removeMember' @model.group member)
-                  }}
+  <page.breadcrumbs>
+    <BreadCrumbs />
+  </page.breadcrumbs>
+
+  <page.header>
+    <Groups::Group::Header @model={{@model.group}} />
+  </page.header>
+
+  <page.navigation>
+    <Groups::Group::Nav @model={{@model.group}} />
+  </page.navigation>
+
+  <page.actions>
+    <Groups::Group::Actions @model={{@model.group}} />
+  </page.actions>
+
+  <page.body>
+    {{#if @model.members}}
+
+      <Rose::Table as |table|>
+        <table.header as |header|>
+          <header.row as |row|>
+            <row.headerCell>{{t 'form.name.label'}}</row.headerCell>
+            <row.headerCell>{{t 'form.id.label'}}</row.headerCell>
+            <row.headerCell>{{t 'titles.actions'}}</row.headerCell>
+          </header.row>
+        </table.header>
+        <table.body as |body|>
+          {{#each @model.members as |member|}}
+            <body.row as |row|>
+              <row.headerCell>
+                {{member.displayName}}
+                {{#if member.accountName}}
+                  <br /><Rose::Badge>{{member.accountName}}</Rose::Badge>
+                {{/if}}
+              </row.headerCell>
+              <row.cell>
+                <Copyable
+                  @text={{member.id}}
+                  @buttonText={{t 'actions.copy-to-clipboard'}}
+                  @acknowledgeText={{t 'states.copied'}}
                 >
-                  {{t 'actions.remove'}}
-                </dropdown.button>
-              </Rose::Dropdown>
-            {{/if}}
-          </row.cell>
-        </body.row>
-      {{/each}}
-    </table.body>
-  </Rose::Table>
+                  <code>{{member.id}}</code>
+                </Copyable>
+              </row.cell>
+              <row.cell>
+                {{#if (can 'removeMembers group' @model.group)}}
+                  <Rose::Dropdown
+                    @icon='flight-icons/svg/more-horizontal-16'
+                    @iconOnly={{true}}
+                    @showCaret={{false}}
+                    @dropdownRight={{true}}
+                    @text='{{t 'actions.manage'}}'
+                    as |dropdown|
+                  >
+                    <dropdown.button
+                      @style='danger'
+                      {{on
+                        'click'
+                        (route-action 'removeMember' @model.group member)
+                      }}
+                    >
+                      {{t 'actions.remove'}}
+                    </dropdown.button>
+                  </Rose::Dropdown>
+                {{/if}}
+              </row.cell>
+            </body.row>
+          {{/each}}
+        </table.body>
+      </Rose::Table>
 
-{{else}}
+    {{else}}
 
-  <Rose::Layout::Centered>
-    <Rose::Message
-      @title={{t 'resources.group.messages.members.title'}}
-      as |message|
-    >
-      <message.description>
-        {{t 'resources.group.messages.members.description'}}
-      </message.description>
-      <message.link @route='scopes.scope.groups.group.add-members'>
-        <Rose::Icon @name='flight-icons/svg/plus-circle-16' />
-        {{t 'resources.group.actions.add-members'}}
-      </message.link>
-    </Rose::Message>
-  </Rose::Layout::Centered>
+      <Rose::Layout::Centered>
+        <Rose::Message
+          @title={{t 'resources.group.messages.members.title'}}
+          as |message|
+        >
+          <message.description>
+            {{t 'resources.group.messages.members.description'}}
+          </message.description>
+          <message.link @route='scopes.scope.groups.group.add-members'>
+            <Rose::Icon @name='flight-icons/svg/plus-circle-16' />
+            {{t 'resources.group.actions.add-members'}}
+          </message.link>
+        </Rose::Message>
+      </Rose::Layout::Centered>
 
-{{/if}}
\ No newline at end of file
+    {{/if}}
+  </page.body>
+
+</Rose::Layout::Page>
\ No newline at end of file

From a0a8aae13946077d0d720dfc72084d9a7054d74a Mon Sep 17 00:00:00 2001
From: Carlos Alcaide Corvo <ccorvo@hashicorp.com>
Date: Tue, 25 Jan 2022 08:22:26 -0800
Subject: [PATCH 3/3] =?UTF-8?q?chore:=20=F0=9F=A4=96=20Add=20follow-redire?=
 =?UTF-8?q?cts=20to=20resoltuions?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add follow-redirect to resolutions to avoid security vulnerability
---
 package.json | 3 ++-
 yarn.lock    | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index fff545633..ccb63380a 100755
--- a/package.json
+++ b/package.json
@@ -84,7 +84,8 @@
     "ansi-regex": "^5.0.1",
     "ember-cli-babel": "^7.26.8",
     "jsonpointer": "5.0.0",
-    "json-schema": "^0.4.0"
+    "json-schema": "^0.4.0",
+    "follow-redirects": "^1.14.7"
   },
   "config": {
     "commitizen": {
diff --git a/yarn.lock b/yarn.lock
index b013ddba4..71c3884be 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13135,10 +13135,10 @@ focus-trap@^6.4.0:
   dependencies:
     tabbable "^5.2.1"
 
-follow-redirects@^1.0.0:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.1.tgz#d9114ded0a1cfdd334e164e6662ad02bfd91ff43"
-  integrity sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg==
+follow-redirects@^1.0.0, follow-redirects@^1.14.7:
+  version "1.14.7"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.7.tgz#2004c02eb9436eee9a21446a6477debf17e81685"
+  integrity sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==
 
 for-in@^1.0.2:
   version "1.0.2"