From c920df142e9c865e5e121abac1a454909e46a64c Mon Sep 17 00:00:00 2001
From: hashishaw <cshaw@hashicorp.com>
Date: Mon, 17 May 2021 11:53:14 -0500
Subject: [PATCH 1/4] Fix model on identity templates

---
 .../components/identity/item-details.hbs      | 24 +++++++++----------
 .../components/identity/item-groups.hbs       | 14 ++++++-----
 .../components/identity/item-members.hbs      | 23 +++++++++++-------
 .../components/identity/item-metadata.hbs     | 15 ++++++------
 .../identity/item-parent-groups.hbs           |  7 +++---
 .../components/identity/item-policies.hbs     |  7 +++---
 6 files changed, 50 insertions(+), 40 deletions(-)

diff --git a/ui/app/templates/components/identity/item-details.hbs b/ui/app/templates/components/identity/item-details.hbs
index 03d6c052c15c..5bdceadf2f13 100644
--- a/ui/app/templates/components/identity/item-details.hbs
+++ b/ui/app/templates/components/identity/item-details.hbs
@@ -1,32 +1,32 @@
 <div class="box is-shadowless is-marginless is-fullwidth">
-  {{#if model.disabled}}
+  {{#if @model.disabled}}
     <AlertBanner
       @type="warning"
       @title="Attention"
-      @message="This {{model.identityType}} is disabled. All associated tokens cannot be used, but are not revoked."
+      @message="This {{@model.identityType}} is disabled. All associated tokens cannot be used, but are not revoked."
       data-test-disabled-warning>
-      {{#if model.canEdit}}
-        <button onclick={{action 'enable' model}} type="button" class="link" data-test-enable=true>
+      {{#if @model.canEdit}}
+        <button onclick={{action 'enable' @model}} type="button" class="link" data-test-enable=true>
           Enable
         </button>
       {{/if}}
     </AlertBanner>
   {{/if}}
-  <InfoTableRow @label="Name" @value={{model.name}} @data-test-identity-item-name={{true}} />
-  <InfoTableRow @label="Type" @value={{model.type}} />
-  <InfoTableRow @label="ID" @value={{model.id}} />
-  <InfoTableRow @label="Merged Ids" @value={{model.mergedEntityIds}}>
+  <InfoTableRow @label="Name" @value={{@model.name}} @data-test-identity-item-name={{true}} />
+  <InfoTableRow @label="Type" @value={{@model.type}} />
+  <InfoTableRow @label="ID" @value={{@model.id}} />
+  <InfoTableRow @label="Merged Ids" @value={{@model.mergedEntityIds}}>
     <div>
-      {{#each model.mergedEntityIds as |id|}}
+      {{#each @model.mergedEntityIds as |id|}}
         <div>
           <code class="has-text-black">{{id}}</code>
         </div>
       {{/each}}
     </div>
   </InfoTableRow>
-  <InfoTableRow @label="Created" @value={{model.creationTime}}>
-    <time datetime={{model.creationTime}} title={{model.creationTime}}>
-      {{date-format model.creationTime 'MMM dd, yyyy [at] h:mm a'}}
+  <InfoTableRow @label="Created" @value={{@model.creationTime}}>
+    <time datetime={{@model.creationTime}} title={{@model.creationTime}}>
+      {{date-format @model.creationTime 'MMM dd, yyyy [at] h:mm a'}}
     </time>
   </InfoTableRow>
   <InfoTableRow @label="Last Updated" @value={{model.lastUpdateTime}}>
diff --git a/ui/app/templates/components/identity/item-groups.hbs b/ui/app/templates/components/identity/item-groups.hbs
index 045424a529c1..5db288a0238d 100644
--- a/ui/app/templates/components/identity/item-groups.hbs
+++ b/ui/app/templates/components/identity/item-groups.hbs
@@ -1,17 +1,19 @@
-{{#if model.groupIds}}
-  {{#each model.directGroupIds as |gid|}}
-    <LinkTo @route="vault.cluster.access.identity.show" @models={{array "groups" gid "details"}} class="list-item-row"><Icon
+{{#if @model.groupIds}}
+  {{#each @model.directGroupIds as |gid|}}
+    <LinkTo @route="vault.cluster.access.identity.show" @models={{array "groups" gid "details"}} class="list-item-row">
+      <Icon
         @glyph="folder-outline"
         class="has-text-grey-light"
       />{{gid}}
     </LinkTo>
   {{/each}}
-  {{#each model.inheritedGroupIds as |gid|}}
+  {{#each @model.inheritedGroupIds as |gid|}}
     {{#linked-block
        "vault.cluster.access.identity.show" "groups" gid "details"
         class="list-item-row"
     }}
-      <LinkTo @route="vault.cluster.access.identity.show" @models={{array "groups" gid "details"}} class="has-text-black"><Icon
+      <LinkTo @route="vault.cluster.access.identity.show" @models={{array "groups" gid "details"}} class="has-text-black">
+        <Icon
           @glyph="folder-outline"
           class="has-text-grey-light"
         />{{gid}}
@@ -21,6 +23,6 @@
   {{/each}}
 {{else}}
   <EmptyState
-    @title="{{model.name}} is not a member of any groups."
+    @title="{{@model.name}} is not a member of any groups."
   />
 {{/if}}
diff --git a/ui/app/templates/components/identity/item-members.hbs b/ui/app/templates/components/identity/item-members.hbs
index c45e66f01d52..c5f6e3e3d00f 100644
--- a/ui/app/templates/components/identity/item-members.hbs
+++ b/ui/app/templates/components/identity/item-members.hbs
@@ -1,5 +1,5 @@
-{{#if model.hasMembers}}
-  {{#each model.memberGroupIds as |gid|}}
+{{#if @model.hasMembers}}
+  {{#each @model.memberGroupIds as |gid|}}
     {{#linked-block
       "vault.cluster.access.identity.show"
       "groups"
@@ -15,14 +15,14 @@
             />{{gid}}</LinkTo>
         </div>
         <div class="column has-text-right">
-          {{#if model.canEdit}}
-            <Identity::PopupMembers @params={{array model "memberGroupIds" gid}} />
+          {{#if @model.canEdit}}
+            <Identity::PopupMembers @params={{array @model "memberGroupIds" gid}} />
           {{/if}}
         </div>
       </div>
     {{/linked-block}}
   {{/each}}
-  {{#each model.memberEntityIds as |gid|}}
+  {{#each @model.memberEntityIds as |gid|}}
     {{#linked-block
       "vault.cluster.access.identity.show"
       "groups"
@@ -32,14 +32,19 @@
     }}
       <div class="columns">
         <div class="column is-10">
-          <LinkTo @route="vault.cluster.access.identity.show" @models={{array "entities" gid "details"}} class="is-block has-text-black has-text-weight-semibold"><Icon
+          <LinkTo
+            @route="vault.cluster.access.identity.show"
+            @models={{array "entities" gid "details"}}
+            class="is-block has-text-black has-text-weight-semibold">
+              <Icon
                 @glyph="user-square-outline"
                 class="has-text-grey-light"
-              />{{gid}}</LinkTo>
+              />{{gid}}
+          </LinkTo>
         </div>
         <div class="column has-text-right">
-          {{#if model.canEdit}}
-            <Identity::PopupMembers @params={{array model "memberEntityIds" gid}} />
+          {{#if @model.canEdit}}
+            <Identity::PopupMembers @params={{array @model "memberEntityIds" gid}} />
           {{/if}}
         </div>
       </div>
diff --git a/ui/app/templates/components/identity/item-metadata.hbs b/ui/app/templates/components/identity/item-metadata.hbs
index 91873d83d9a6..33d730d2e418 100644
--- a/ui/app/templates/components/identity/item-metadata.hbs
+++ b/ui/app/templates/components/identity/item-metadata.hbs
@@ -1,4 +1,5 @@
-{{#each-in model.metadata as |key value|}}
+{{log "model" model this.model @model}}
+{{#each-in @model.metadata as |key value|}}
   <div class="info-table-row is-mobile">
     <div class="is-flex is-fullwidth">
       <div class="column is-one-quarter">
@@ -10,19 +11,19 @@
         {{value}}
       </div>
       <div class="column has-text-right">
-        {{#if model.canEdit}}
-          <Identity::PopupMetadata @params={{array model key}} />
+        {{#if @model.canEdit}}
+          <Identity::PopupMetadata @params={{array @model key}} />
         {{/if}}
       </div>
     </div>
   </div>
 {{else}}
   <EmptyState
-    @title="No metadata for {{model.name}}"
-    @message="You can store custom data that you want to associate with a {{lowercase (humanize model.identityType)}}. Edit this {{lowercase (humanize model.identityType)}} to get started."
+    @title="No metadata for {{@model.name}}"
+    @message="You can store custom data that you want to associate with a {{lowercase (humanize @model.identityType)}}. Edit this {{lowercase (humanize @model.identityType)}} to get started."
   >
-    <LinkTo @route="vault.cluster.access.identity.edit" @model={{model.id}} @tagName="button" class="link">
-      Edit {{lowercase (humanize model.identityType)}}
+    <LinkTo @route="vault.cluster.access.identity.edit" @model={{@model.id}} @tagName="button" class="link">
+      Edit {{lowercase (humanize @model.identityType)}}
     </LinkTo>
     <LearnLink @path="/vault/identity-access-management/iam-identity">
       Learn more
diff --git a/ui/app/templates/components/identity/item-parent-groups.hbs b/ui/app/templates/components/identity/item-parent-groups.hbs
index c0031c7c4888..fabc4879e4cb 100644
--- a/ui/app/templates/components/identity/item-parent-groups.hbs
+++ b/ui/app/templates/components/identity/item-parent-groups.hbs
@@ -1,5 +1,5 @@
-{{#if model.parentGroupIds.length}}
-  {{#each model.parentGroupIds as |gid|}}
+{{#if @model.parentGroupIds.length}}
+  {{#each @model.parentGroupIds as |gid|}}
     {{#linked-block
       "vault.cluster.access.identity.show"
       "groups"
@@ -9,7 +9,8 @@
     }}
       <div class="columns is-mobile">
         <div class="column is-10">
-          <LinkTo @route="vault.cluster.access.identity.show" @models={{array "groups" gid "details"}} class="is-block has-text-black has-text-weight-semibold"><Icon
+          <LinkTo @route="vault.cluster.access.identity.show" @models={{array "groups" gid "details"}} class="is-block has-text-black has-text-weight-semibold">
+            <Icon
               @glyph="folder-outline"
               class="has-text-grey-light"
             />{{gid}}
diff --git a/ui/app/templates/components/identity/item-policies.hbs b/ui/app/templates/components/identity/item-policies.hbs
index 5d675588ed98..cab6df2a662f 100644
--- a/ui/app/templates/components/identity/item-policies.hbs
+++ b/ui/app/templates/components/identity/item-policies.hbs
@@ -7,12 +7,13 @@
   }}
     <div class="columns is-mobile">
       <div class="column is-10">
-        <LinkTo @route="vault.cluster.policy.show" @models={{array "acl" policyName}} class="is-block has-text-black has-text-weight-semibold"><span class="is-underline">{{policyName}}</span>
+        <LinkTo @route="vault.cluster.policy.show" @models={{array "acl" policyName}} class="is-block has-text-black has-text-weight-semibold">
+          <span class="is-underline">{{policyName}}</span>
         </LinkTo>
       </div>
       <div class="column has-text-right">
-        {{#if model.canEdit}}
-          <Identity::PopupPolicy @params={{array model policyName}} />
+        {{#if @model.canEdit}}
+          <Identity::PopupPolicy @params={{array @model policyName}} />
         {{/if}}
       </div>
     </div>

From 590b37f64dbd99132cc9c533e96024331db9a7d9 Mon Sep 17 00:00:00 2001
From: hashishaw <cshaw@hashicorp.com>
Date: Mon, 17 May 2021 15:49:14 -0500
Subject: [PATCH 2/4] Add tests for identity tabs

---
 ui/app/models/identity/group.js                  |  4 ++--
 .../vault/cluster/access/identity/show.hbs       |  2 +-
 .../acceptance/access/identity/_shared-tests.js  | 16 +++++++++++++---
 ui/tests/pages/components/identity/edit-form.js  |  2 ++
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/ui/app/models/identity/group.js b/ui/app/models/identity/group.js
index d51a96ef6af1..31a0b6932928 100644
--- a/ui/app/models/identity/group.js
+++ b/ui/app/models/identity/group.js
@@ -64,8 +64,8 @@ export default IdentityModel.extend({
     'memberGroupIds.[]',
     function() {
       let { memberEntityIds, memberGroupIds } = this;
-      let numEntities = (memberEntityIds && memberEntityIds.get('length')) || 0;
-      let numGroups = (memberGroupIds && memberGroupIds.get('length')) || 0;
+      let numEntities = (memberEntityIds && memberEntityIds.length) || 0;
+      let numGroups = (memberGroupIds && memberGroupIds.length) || 0;
       return numEntities + numGroups > 0;
     }
   ),
diff --git a/ui/app/templates/vault/cluster/access/identity/show.hbs b/ui/app/templates/vault/cluster/access/identity/show.hbs
index df09bf4173a2..9aa7a244ab37 100644
--- a/ui/app/templates/vault/cluster/access/identity/show.hbs
+++ b/ui/app/templates/vault/cluster/access/identity/show.hbs
@@ -21,7 +21,7 @@
   <nav class="tabs sub-nav">
     <ul>
       {{#each (tabs-for-identity-show model.identityType model.type) as |tab|}}
-        <LinkTo @route="vault.cluster.access.identity.show" @models={{array (pluralize model.identityType) model.id tab}} @tagName="li">
+        <LinkTo @route="vault.cluster.access.identity.show" @models={{array (pluralize model.identityType) model.id tab}} @tagName="li" data-test-tab-subnav={{tab}}>
           <LinkTo @route="vault.cluster.access.identity.show" @models={{array (pluralize model.identityType) model.id tab}}>
             {{capitalize (humanize tab)}}
           </LinkTo>
diff --git a/ui/tests/acceptance/access/identity/_shared-tests.js b/ui/tests/acceptance/access/identity/_shared-tests.js
index ea5cee664d9f..8a42d81705b7 100644
--- a/ui/tests/acceptance/access/identity/_shared-tests.js
+++ b/ui/tests/acceptance/access/identity/_shared-tests.js
@@ -1,4 +1,5 @@
-import { settled, currentRouteName } from '@ember/test-helpers';
+import { settled, currentRouteName, click, findAll } from '@ember/test-helpers';
+import { selectChoose, clickTrigger } from 'ember-power-select/test-support/helpers';
 import page from 'vault/tests/pages/access/identity/create';
 import showPage from 'vault/tests/pages/access/identity/show';
 import indexPage from 'vault/tests/pages/access/identity/index';
@@ -42,8 +43,17 @@ export const testCRUD = async (name, itemType, assert) => {
 export const testDeleteFromForm = async (name, itemType, assert) => {
   await page.visit({ item_type: itemType });
   await settled();
-  await page.editForm.name(name).submit();
-  await settled();
+  await page.editForm.name(name);
+  await page.editForm.metadataKey('hello');
+  await page.editForm.metadataValue('goodbye');
+  await clickTrigger('#policies');
+  // first option should be "default"
+  await selectChoose('#policies', '.ember-power-select-option', 0);
+  await page.editForm.submit();
+  await click('[data-test-tab-subnav="policies"]');
+  assert.equal(findAll('.list-item-row').length, 1, 'One item is under policies');
+  await click('[data-test-tab-subnav="metadata"]');
+  assert.dom('.info-table-row').hasText('hello goodbye', 'Metadata shows on tab');
   await showPage.edit();
   assert.equal(
     currentRouteName(),
diff --git a/ui/tests/pages/components/identity/edit-form.js b/ui/tests/pages/components/identity/edit-form.js
index 74e72e01e401..db34da0c2a80 100644
--- a/ui/tests/pages/components/identity/edit-form.js
+++ b/ui/tests/pages/components/identity/edit-form.js
@@ -7,6 +7,8 @@ export default {
   cancelLink: clickable('[data-test-cancel-link]'),
   name: fillable('[data-test-input="name"]'),
   disabled: clickable('[data-test-input="disabled"]'),
+  metadataKey: fillable('[data-test-kv-key]'),
+  metadataValue: fillable('[data-test-kv-value]'),
   type: fillable('[data-test-input="type"]'),
   submit: clickable('[data-test-identity-submit]'),
   delete: clickable('[data-test-confirm-action-trigger]'),

From c3be521d44f59d2f85232291eb030011ac1a5b09 Mon Sep 17 00:00:00 2001
From: hashishaw <cshaw@hashicorp.com>
Date: Mon, 17 May 2021 15:58:13 -0500
Subject: [PATCH 3/4] Add changelog

---
 changelog/11641.txt | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 changelog/11641.txt

diff --git a/changelog/11641.txt b/changelog/11641.txt
new file mode 100644
index 000000000000..84bd31188beb
--- /dev/null
+++ b/changelog/11641.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+ui: Fix entity group membership and metadata not showing
+```

From 8420f2b709368768bef4de544504bebdbe335a8b Mon Sep 17 00:00:00 2001
From: hashishaw <cshaw@hashicorp.com>
Date: Mon, 17 May 2021 16:28:56 -0500
Subject: [PATCH 4/4] Remove template log

---
 ui/app/templates/components/database-connection.hbs    | 7 +++----
 ui/app/templates/components/identity/item-metadata.hbs | 1 -
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/ui/app/templates/components/database-connection.hbs b/ui/app/templates/components/database-connection.hbs
index 638464252575..61a9683160dc 100644
--- a/ui/app/templates/components/database-connection.hbs
+++ b/ui/app/templates/components/database-connection.hbs
@@ -87,7 +87,7 @@
         {{form-field data-test-field attr=attr model=@model}}
       {{/if}}
     {{/each}}
-    
+
     {{!-- Plugin Config Section --}}
     <div class="form-section box is-shadowless is-fullwidth">
       <fieldset class="form-fieldset">
@@ -148,7 +148,6 @@
           />
         {{else}}
           {{#each @model.statementFields as |attr|}}
-          {{log attr}}
             {{form-field data-test-field attr=attr model=@model}}
           {{/each}}
         {{/if}}
@@ -295,11 +294,11 @@
   {{#each @model.showAttrs as |attr|}}
     {{#let attr.options.defaultDisplay as |defaultDisplay|}}
       {{#if (eq attr.type "object")}}
-        <InfoTableRow 
+        <InfoTableRow
           @alwaysRender={{true}}
           @defaultShown={{attr.options.defaultShown}}
           @label={{capitalize (or attr.options.label (humanize (dasherize attr.name)))}}
-          @value={{stringify (get @model attr.name)}} 
+          @value={{stringify (get @model attr.name)}}
         />
       {{else if (eq attr.type "array")}}
         <InfoTableRow
diff --git a/ui/app/templates/components/identity/item-metadata.hbs b/ui/app/templates/components/identity/item-metadata.hbs
index 33d730d2e418..495b8fc8b105 100644
--- a/ui/app/templates/components/identity/item-metadata.hbs
+++ b/ui/app/templates/components/identity/item-metadata.hbs
@@ -1,4 +1,3 @@
-{{log "model" model this.model @model}}
 {{#each-in @model.metadata as |key value|}}
   <div class="info-table-row is-mobile">
     <div class="is-flex is-fullwidth">