Merge pull request #904 from hashicorp/refactor-render-template-users

Refactor user usage of renderTemplate

ui/admin/app/routes/scopes/scope/users/user.js

@@ -12,27 +12,4 @@ export default class ScopesScopeUsersUserRoute extends Route {
   async model({ user_id }) {
     return this.store.findRecord('user', user_id);
   }
-
-  /**
-   * Renders the route-set specific page sections
-   * @override
-   */
-  renderTemplate() {
-    super.renderTemplate(...arguments);
-
-    this.render('scopes/scope/users/user/-header', {
-      into: 'scopes/scope/users/user',
-      outlet: 'header',
-    });
-
-    this.render('scopes/scope/users/user/-actions', {
-      into: 'scopes/scope/users/user',
-      outlet: 'actions',
-    });
-
-    this.render('scopes/scope/users/user/-navigation', {
-      into: 'scopes/scope/users/user',
-      outlet: 'navigation',
-    });
-  }
 }

ui/admin/app/routes/scopes/scope/users/user/add-accounts.js

@@ -38,29 +38,6 @@ export default class ScopesScopeUsersUserAddAccountsRoute extends Route {
     return { user, authMethods, accounts };
   }
 
-  /**
-   * Renders the route-set specific page sections
-   * @override
-   */
-  renderTemplate() {
-    super.renderTemplate(...arguments);
-
-    this.render('scopes/scope/users/user/add-accounts/-header', {
-      into: 'scopes/scope/users/user',
-      outlet: 'header',
-    });
-
-    this.render('-empty', {
-      into: 'scopes/scope/users/user',
-      outlet: 'actions',
-    });
-
-    this.render('-empty', {
-      into: 'scopes/scope/users/user',
-      outlet: 'navigation',
-    });
-  }
-
   // =actions
 
   /**

ui/admin/app/templates/scopes/scope/users/user.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>
+{{outlet}}

ui/admin/app/templates/scopes/scope/users/user/accounts.hbs

@@ -1,79 +1,101 @@
 {{page-title (t 'resources.user.messages.accounts.title')}}
 
-{{#if @model.accounts}}
+<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.accounts as |account|}}
-        <body.row as |row|>
-          <row.headerCell>
-            {{account.accountName}}
-            <p>{{account.description}}</p>
-          </row.headerCell>
-          <row.cell>
-            <Rose::Badge>
-              {{t (concat 'resources.auth-method.types.' account.type)}}
-            </Rose::Badge>
-          </row.cell>
-          <row.cell>
-            <Copyable
-              @text={{account.id}}
-              @buttonText={{t 'actions.copy-to-clipboard'}}
-              @acknowledgeText={{t 'states.copied'}}
-            >
-              <code>{{account.id}}</code>
-            </Copyable>
-          </row.cell>
-          <row.cell>
-            {{#if (can 'removeAccounts user' @model.user)}}
-              <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 'removeAccount' @model.user account)
-                  }}
+  <page.breadcrumbs>
+    <BreadCrumbs />
+  </page.breadcrumbs>
+
+  <page.header>
+    <Users::User::Header @model={{@model.user}} />
+  </page.header>
+
+  <page.navigation>
+    <Users::User::Nav @model={{@model.user}} />
+  </page.navigation>
+
+  <page.actions>
+    <Users::User::Actions @model={{@model.user}} />
+  </page.actions>
+
+  <page.body>
+    {{#if @model.accounts}}
+
+      <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.accounts as |account|}}
+            <body.row as |row|>
+              <row.headerCell>
+                {{account.accountName}}
+                <p>{{account.description}}</p>
+              </row.headerCell>
+              <row.cell>
+                <Rose::Badge>
+                  {{t (concat 'resources.auth-method.types.' account.type)}}
+                </Rose::Badge>
+              </row.cell>
+              <row.cell>
+                <Copyable
+                  @text={{account.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>{{account.id}}</code>
+                </Copyable>
+              </row.cell>
+              <row.cell>
+                {{#if (can 'removeAccounts user' @model.user)}}
+                  <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 'removeAccount' @model.user account)
+                      }}
+                    >
+                      {{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.user.messages.accounts.title'}}
-      as |message|
-    >
-      <message.description>
-        {{t 'resources.user.messages.accounts.description'}}
-      </message.description>
-      <message.link @route='scopes.scope.users.user.add-accounts'>
-        <Rose::Icon @name='flight-icons/svg/plus-circle-16' />
-        {{t 'resources.user.actions.add-accounts'}}
-      </message.link>
-    </Rose::Message>
-  </Rose::Layout::Centered>
+      <Rose::Layout::Centered>
+        <Rose::Message
+          @title={{t 'resources.user.messages.accounts.title'}}
+          as |message|
+        >
+          <message.description>
+            {{t 'resources.user.messages.accounts.description'}}
+          </message.description>
+          <message.link @route='scopes.scope.users.user.add-accounts'>
+            <Rose::Icon @name='flight-icons/svg/plus-circle-16' />
+            {{t 'resources.user.actions.add-accounts'}}
+          </message.link>
+        </Rose::Message>
+      </Rose::Layout::Centered>
 
-{{/if}}
+    {{/if}}
+  </page.body>
+
+</Rose::Layout::Page>

ui/admin/app/templates/scopes/scope/users/user/add-accounts.hbs

@@ -1,28 +1,43 @@
 {{page-title (t 'resources.user.actions.add-accounts')}}
 
-{{#if @model.accounts}}
-  <Form::User::AddAccounts
-    @model={{@model.user}}
-    @authMethods={{@model.authMethods}}
-    @accounts={{@model.accounts}}
-    @submit={{route-action 'addAccounts' @model.user}}
-    @cancel={{route-action 'cancel'}}
-  />
-{{/if}}
+<Rose::Layout::Page as |page|>
 
-{{#unless @model.accounts}}
-  <Rose::Layout::Centered>
-    <Rose::Message
-      @title={{t 'resources.user.messages.no-accounts.title'}}
-      as |message|
-    >
-      <message.description>
-        {{t 'resources.user.messages.no-accounts.description'}}
-      </message.description>
-      <message.link @route='scopes.scope.users.user.accounts'>
-        <Rose::Icon @name='flight-icons/svg/chevron-left-16' />
-        {{t 'actions.back'}}
-      </message.link>
-    </Rose::Message>
-  </Rose::Layout::Centered>
-{{/unless}}
+  <page.breadcrumbs>
+    <BreadCrumbs />
+  </page.breadcrumbs>
+
+  <page.header>
+    <h2>{{t 'resources.user.messages.add-accounts.title'}}</h2>
+    <p>{{t 'resources.user.messages.add-accounts.description'}}</p>
+  </page.header>
+
+  <page.body>
+    {{#if @model.accounts}}
+      <Form::User::AddAccounts
+        @model={{@model.user}}
+        @authMethods={{@model.authMethods}}
+        @accounts={{@model.accounts}}
+        @submit={{route-action 'addAccounts' @model.user}}
+        @cancel={{route-action 'cancel'}}
+      />
+    {{/if}}
+
+    {{#unless @model.accounts}}
+      <Rose::Layout::Centered>
+        <Rose::Message
+          @title={{t 'resources.user.messages.no-accounts.title'}}
+          as |message|
+        >
+          <message.description>
+            {{t 'resources.user.messages.no-accounts.description'}}
+          </message.description>
+          <message.link @route='scopes.scope.users.user.accounts'>
+            <Rose::Icon @name='flight-icons/svg/chevron-left-16' />
+            {{t 'actions.back'}}
+          </message.link>
+        </Rose::Message>
+      </Rose::Layout::Centered>
+    {{/unless}}
+  </page.body>
+
+</Rose::Layout::Page>

ui/admin/app/templates/scopes/scope/users/user/add-accounts/-header.hbs

@@ -1,2 +0,0 @@
-<h2>{{t 'resources.user.messages.add-accounts.title'}}</h2>
-<p>{{t 'resources.user.messages.add-accounts.description'}}</p>

ui/admin/app/templates/scopes/scope/users/user/index.hbs

@@ -1,5 +1,27 @@
-<Form::User
-  @model={{@model}}
-  @submit={{route-action 'save' @model}}
-  @cancel={{route-action 'cancel' @model}}
-/>
+<Rose::Layout::Page as |page|>
+
+  <page.breadcrumbs>
+    <BreadCrumbs />
+  </page.breadcrumbs>
+
+  <page.header>
+    <Users::User::Header @model={{@model}} />
+  </page.header>
+
+  <page.navigation>
+    <Users::User::Nav @model={{@model}} />
+  </page.navigation>
+
+  <page.actions>
+    <Users::User::Actions @model={{@model}} />
+  </page.actions>
+
+  <page.body>
+    <Form::User
+      @model={{@model}}
+      @submit={{route-action 'save' @model}}
+      @cancel={{route-action 'cancel' @model}}
+    />
+  </page.body>
+
+</Rose::Layout::Page>