From 7c377506c8296a63054ecd4aa0b899eea404845d Mon Sep 17 00:00:00 2001
From: dharini <dharini@hashicorp.com>
Date: Thu, 19 Aug 2021 16:06:47 -0700
Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20host=20catalog=20cap?=
 =?UTF-8?q?abilities?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 addons/api/mirage/factories/host-catalog.js   |   8 +
 .../components/form/host-catalog/index.hbs    |  16 +-
 .../host-catalogs/host-catalog/-actions.hbs   |  18 +-
 .../scopes/scope/host-catalogs/index.hbs      |  14 +-
 .../acceptance/host-catalogs/delete-test.js   | 126 +++++++++++++
 .../acceptance/host-catalogs/read-test.js     |  84 +++++++++
 .../acceptance/host-catalogs/update-test.js   | 170 ++++++++++++++++++
 7 files changed, 414 insertions(+), 22 deletions(-)
 create mode 100644 ui/admin/tests/acceptance/host-catalogs/delete-test.js
 create mode 100644 ui/admin/tests/acceptance/host-catalogs/read-test.js
 create mode 100644 ui/admin/tests/acceptance/host-catalogs/update-test.js

diff --git a/addons/api/mirage/factories/host-catalog.js b/addons/api/mirage/factories/host-catalog.js
index ffb849668..cd033f7f3 100644
--- a/addons/api/mirage/factories/host-catalog.js
+++ b/addons/api/mirage/factories/host-catalog.js
@@ -1,7 +1,15 @@
 import factory from '../generated/factories/host-catalog';
 import { trait } from 'ember-cli-mirage';
+import permissions from '../helpers/permissions';
 
 export default factory.extend({
+  authorized_actions: () =>
+    permissions.authorizedActionsFor('host-catalog') || [
+      'no-op',
+      'read',
+      'update',
+      'delete',
+    ],
   withChildren: trait({
     afterCreate(hostCatalog, server) {
       const { scope } = hostCatalog;
diff --git a/ui/admin/app/components/form/host-catalog/index.hbs b/ui/admin/app/components/form/host-catalog/index.hbs
index a0c3230ef..39571b820 100644
--- a/ui/admin/app/components/form/host-catalog/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/index.hbs
@@ -45,12 +45,12 @@
       </field.errors>
     {{/if}}
   </form.textarea>
-
-  <form.actions
-    @disabled={{if @model.cannotSave @model.cannotSave}}
-    @enableEditText={{t 'actions.edit-form'}}
-    @submitText={{t 'actions.save'}}
-    @cancelText={{t 'actions.cancel'}}
-  />
-
+  {{#if (can 'save model' @model)}}
+    <form.actions
+      @disabled={{if @model.cannotSave @model.cannotSave}}
+      @enableEditText={{t 'actions.edit-form'}}
+      @submitText={{t 'actions.save'}}
+      @cancelText={{t 'actions.cancel'}}
+    />
+  {{/if}}
 </Rose::Form>
\ No newline at end of file
diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/-actions.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/-actions.hbs
index 656eba6ee..bf5fe452e 100644
--- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/-actions.hbs
+++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/-actions.hbs
@@ -15,12 +15,14 @@
   >
     {{t 'resources.host-set.actions.create'}}
   </dropdown.link>
-  <dropdown.separator />
-  <dropdown.button
-    @style='danger'
-    @disabled={{@model.canSave}}
-    {{on 'click' (route-action 'delete' @model)}}
-  >
-    {{t 'resources.host-catalog.actions.delete'}}
-  </dropdown.button>
+  {{#if (can 'delete model' @model)}}
+    <dropdown.separator />
+    <dropdown.button
+      @style='danger'
+      @disabled={{@model.canSave}}
+      {{on 'click' (route-action 'delete' @model)}}
+    >
+      {{t 'resources.host-catalog.actions.delete'}}
+    </dropdown.button>
+  {{/if}}
 </Rose::Dropdown>
\ No newline at end of file
diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/index.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/index.hbs
index dcc1f811c..c118c4035 100644
--- a/ui/admin/app/templates/scopes/scope/host-catalogs/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/host-catalogs/index.hbs
@@ -41,12 +41,14 @@
           {{#each @model as |hostCatalog|}}
             <body.row as |row|>
               <row.headerCell>
-                <LinkTo
-                  @route='scopes.scope.host-catalogs.host-catalog'
-                  @model={{hostCatalog.id}}
-                >
-                  {{hostCatalog.displayName}}
-                </LinkTo>
+                {{#if (can 'read model' hostCatalog)}}
+                  <LinkTo
+                    @route='scopes.scope.host-catalogs.host-catalog'
+                    @model={{hostCatalog.id}}
+                  >
+                    {{hostCatalog.displayName}}
+                  </LinkTo>
+                {{/if}}
                 <p>{{hostCatalog.description}}</p>
               </row.headerCell>
               <row.cell>
diff --git a/ui/admin/tests/acceptance/host-catalogs/delete-test.js b/ui/admin/tests/acceptance/host-catalogs/delete-test.js
new file mode 100644
index 000000000..997a559aa
--- /dev/null
+++ b/ui/admin/tests/acceptance/host-catalogs/delete-test.js
@@ -0,0 +1,126 @@
+import { module, test } from 'qunit';
+import { visit, find, click } from '@ember/test-helpers';
+import { setupApplicationTest } from 'ember-qunit';
+import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { Response } from 'miragejs';
+import { resolve, reject } from 'rsvp';
+import sinon from 'sinon';
+import {
+  authenticateSession,
+  // These are left here intentionally for future reference.
+  //currentSession,
+  //invalidateSession,
+} from 'ember-simple-auth/test-support';
+
+module('Acceptance | host-catalogs | delete', function (hooks) {
+  setupApplicationTest(hooks);
+  setupMirage(hooks);
+
+  let gethostCatalogCount;
+
+  const instances = {
+    scopes: {
+      global: null,
+      org: null,
+      project: null,
+    },
+  };
+  const urls = {
+    globalScope: null,
+    orgScope: null,
+    projectScope: null,
+    hostCatalogs: null,
+    hostCatalog: null,
+    newHostCatalog: null,
+  };
+
+  hooks.beforeEach(function () {
+    // Generate resources
+    instances.scopes.global = this.server.create('scope', { id: 'global' });
+    instances.scopes.org = this.server.create('scope', {
+      type: 'org',
+      scope: { id: 'global', type: 'global' },
+    });
+    instances.scopes.project = this.server.create('scope', {
+      type: 'project',
+      scope: { id: instances.scopes.org.id, type: 'org' },
+    });
+    instances.hostCatalog = this.server.create('host-catalog', {
+      scope: instances.scopes.project,
+    });
+    // Generate route URLs for resources
+    urls.globalScope = `/scopes/global/scopes`;
+    urls.orgScope = `/scopes/${instances.scopes.org.id}/scopes`;
+    urls.projectScope = `/scopes/${instances.scopes.project.id}`;
+    urls.hostCatalogs = `${urls.projectScope}/host-catalogs`;
+    urls.hostCatalog = `${urls.hostCatalogs}/${instances.hostCatalog.id}`;
+    urls.unknownHostCatalog = `${urls.hostCatalogs}/foo`;
+    urls.newHostCatalog = `${urls.hostCatalogs}/new`;
+    // Generate resource couner
+    gethostCatalogCount = () =>
+      this.server.schema.hostCatalogs.all().models.length;
+    authenticateSession({});
+  });
+
+  test('can delete host catalog', async function (assert) {
+    assert.expect(1);
+    const count = gethostCatalogCount();
+    await visit(urls.hostCatalog);
+    await click('.rose-layout-page-actions .rose-dropdown-button-danger');
+    assert.equal(gethostCatalogCount(), count - 1);
+  });
+
+  test('cannot delete host catalog without proper authorization', async function (assert) {
+    assert.expect(1);
+    instances.hostCatalog.authorized_actions =
+      instances.hostCatalog.authorized_actions.filter(
+        (item) => item !== 'delete'
+      );
+    await visit(urls.hostCatalog);
+    assert.notOk(
+      find('.rose-layout-page-actions .rose-dropdown-button-danger')
+    );
+  });
+
+  test('can accept delete host catalog via dialog', async function (assert) {
+    assert.expect(2);
+    const confirmService = this.owner.lookup('service:confirm');
+    confirmService.enabled = true;
+    confirmService.confirm = sinon.fake.returns(resolve());
+    const count = gethostCatalogCount();
+    await visit(urls.hostCatalog);
+    await click('.rose-layout-page-actions .rose-dropdown-button-danger');
+    assert.equal(gethostCatalogCount(), count - 1);
+    assert.ok(confirmService.confirm.calledOnce);
+  });
+
+  test('cannot cancel delete host catalog via dialog', async function (assert) {
+    assert.expect(2);
+    const confirmService = this.owner.lookup('service:confirm');
+    confirmService.enabled = true;
+    confirmService.confirm = sinon.fake.returns(reject());
+    const count = gethostCatalogCount();
+    await visit(urls.hostCatalog);
+    await click('.rose-layout-page-actions .rose-dropdown-button-danger');
+    assert.equal(gethostCatalogCount(), count);
+    assert.ok(confirmService.confirm.calledOnce);
+  });
+
+  test('deleting a host catalog which errors displays error messages', async function (assert) {
+    assert.expect(1);
+    this.server.del('/host-catalogs/:id', () => {
+      return new Response(
+        490,
+        {},
+        {
+          status: 490,
+          code: 'error',
+          message: 'Oops.',
+        }
+      );
+    });
+    await visit(urls.hostCatalog);
+    await click('.rose-layout-page-actions .rose-dropdown-button-danger');
+    assert.ok(find('[role="alert"]').textContent.trim(), 'Oops.');
+  });
+});
diff --git a/ui/admin/tests/acceptance/host-catalogs/read-test.js b/ui/admin/tests/acceptance/host-catalogs/read-test.js
new file mode 100644
index 000000000..1544ad4d3
--- /dev/null
+++ b/ui/admin/tests/acceptance/host-catalogs/read-test.js
@@ -0,0 +1,84 @@
+import { module, test } from 'qunit';
+import { visit, currentURL, find } from '@ember/test-helpers';
+import { setupApplicationTest } from 'ember-qunit';
+import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import a11yAudit from 'ember-a11y-testing/test-support/audit';
+import {
+  authenticateSession,
+  // These are left here intentionally for future reference.
+  //currentSession,
+  //invalidateSession,
+} from 'ember-simple-auth/test-support';
+
+module('Acceptance | host-catalogs | read', function (hooks) {
+  setupApplicationTest(hooks);
+  setupMirage(hooks);
+
+  const instances = {
+    scopes: {
+      global: null,
+      org: null,
+      project: null,
+    },
+  };
+  const urls = {
+    globalScope: null,
+    orgScope: null,
+    projectScope: null,
+    hostCatalogs: null,
+    hostCatalog: null,
+    newHostCatalog: null,
+  };
+
+  hooks.beforeEach(function () {
+    // Generate resources
+    instances.scopes.global = this.server.create('scope', { id: 'global' });
+    instances.scopes.org = this.server.create('scope', {
+      type: 'org',
+      scope: { id: 'global', type: 'global' },
+    });
+    instances.scopes.project = this.server.create('scope', {
+      type: 'project',
+      scope: { id: instances.scopes.org.id, type: 'org' },
+    });
+    instances.hostCatalog = this.server.create('host-catalog', {
+      scope: instances.scopes.project,
+    });
+    // Generate route URLs for resources
+    urls.globalScope = `/scopes/global/scopes`;
+    urls.orgScope = `/scopes/${instances.scopes.org.id}/scopes`;
+    urls.projectScope = `/scopes/${instances.scopes.project.id}`;
+    urls.hostCatalogs = `${urls.projectScope}/host-catalogs`;
+    urls.hostCatalog = `${urls.hostCatalogs}/${instances.hostCatalog.id}`;
+    urls.unknownHostCatalog = `${urls.hostCatalogs}/foo`;
+    urls.newHostCatalog = `${urls.hostCatalogs}/new`;
+    authenticateSession({});
+  });
+
+  test('visiting host catalogs', async function (assert) {
+    assert.expect(2);
+    await visit(urls.hostCatalogs);
+    await a11yAudit();
+    assert.equal(currentURL(), urls.hostCatalogs);
+    await visit(urls.hostCatalog);
+    await a11yAudit();
+    assert.equal(currentURL(), urls.hostCatalog);
+  });
+
+  test('cannot navigate to a host catalog form without proper authorization', async function (assert) {
+    assert.expect(1);
+    instances.hostCatalog.authorized_actions =
+      instances.hostCatalog.authorized_actions.filter(
+        (item) => item !== 'read'
+      );
+    await visit(urls.hostCatalog);
+    assert.notOk(find('main tbody .rose-table-header-cell:nth-child(1) a'));
+  });
+
+  test('visiting an unknown host catalog displays 404 message', async function (assert) {
+    assert.expect(1);
+    await visit(urls.unknownHostCatalog);
+    await a11yAudit();
+    assert.ok(find('.rose-message-subtitle').textContent.trim(), 'Error 404');
+  });
+});
diff --git a/ui/admin/tests/acceptance/host-catalogs/update-test.js b/ui/admin/tests/acceptance/host-catalogs/update-test.js
new file mode 100644
index 000000000..31a795189
--- /dev/null
+++ b/ui/admin/tests/acceptance/host-catalogs/update-test.js
@@ -0,0 +1,170 @@
+import { module, test } from 'qunit';
+import { visit, currentURL, find, click, fillIn } from '@ember/test-helpers';
+import { setupApplicationTest } from 'ember-qunit';
+import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { Response } from 'miragejs';
+import {
+  authenticateSession,
+  // These are left here intentionally for future reference.
+  //currentSession,
+  //invalidateSession,
+} from 'ember-simple-auth/test-support';
+
+module('Acceptance | host-catalogs | update', function (hooks) {
+  setupApplicationTest(hooks);
+  setupMirage(hooks);
+
+  const instances = {
+    scopes: {
+      global: null,
+      org: null,
+      project: null,
+    },
+  };
+  const urls = {
+    globalScope: null,
+    orgScope: null,
+    projectScope: null,
+    hostCatalogs: null,
+    hostCatalog: null,
+    newHostCatalog: null,
+  };
+
+  hooks.beforeEach(function () {
+    // Generate resources
+    instances.scopes.global = this.server.create('scope', { id: 'global' });
+    instances.scopes.org = this.server.create('scope', {
+      type: 'org',
+      scope: { id: 'global', type: 'global' },
+    });
+    instances.scopes.project = this.server.create('scope', {
+      type: 'project',
+      scope: { id: instances.scopes.org.id, type: 'org' },
+    });
+    instances.hostCatalog = this.server.create('host-catalog', {
+      scope: instances.scopes.project,
+    });
+    // Generate route URLs for resources
+    urls.globalScope = `/scopes/global/scopes`;
+    urls.orgScope = `/scopes/${instances.scopes.org.id}/scopes`;
+    urls.projectScope = `/scopes/${instances.scopes.project.id}`;
+    urls.hostCatalogs = `${urls.projectScope}/host-catalogs`;
+    urls.hostCatalog = `${urls.hostCatalogs}/${instances.hostCatalog.id}`;
+    urls.unknownHostCatalog = `${urls.hostCatalogs}/foo`;
+    urls.newHostCatalog = `${urls.hostCatalogs}/new`;
+    authenticateSession({});
+  });
+
+  test('can save changes to existing host catalog', async function (assert) {
+    assert.expect(3);
+    assert.notEqual(instances.hostCatalog.name, 'random string');
+    await visit(urls.hostCatalog);
+    await click('form [type="button"]', 'Activate edit mode');
+    await fillIn('[name="name"]', 'random string');
+    await click('.rose-form-actions [type="submit"]');
+    assert.equal(currentURL(), urls.hostCatalog);
+    assert.equal(
+      this.server.schema.hostCatalogs.all().models[0].name,
+      'random string'
+    );
+  });
+
+  test('cannot make changes to an existing host catalog without proper authorization', async function (assert) {
+    assert.expect(1);
+    instances.hostCatalog.authorized_actions =
+      instances.hostCatalog.authorized_actions.filter(
+        (item) => item !== 'update'
+      );
+    await visit(urls.hostCatalog);
+    assert.notOk(find('.rose-layout-page-actions .rose-button-secondary'));
+  });
+
+  test('can cancel changes to existing host catalog', async function (assert) {
+    assert.expect(2);
+    await visit(urls.hostCatalog);
+    await click('form [type="button"]', 'Activate edit mode');
+    await fillIn('[name="name"]', 'random string');
+    await click('.rose-form-actions [type="button"]');
+    assert.notEqual(instances.hostCatalog.name, 'random string');
+    assert.equal(find('[name="name"]').value, instances.hostCatalog.name);
+  });
+
+  test('saving an existing host catalog with invalid fields displays error messages', async function (assert) {
+    assert.expect(2);
+    this.server.patch('/host-catalogs/:id', () => {
+      return new Response(
+        400,
+        {},
+        {
+          status: 400,
+          code: 'invalid_argument',
+          message: 'The request was invalid.',
+          details: {
+            request_fields: [
+              {
+                name: 'name',
+                description: 'Name is required.',
+              },
+            ],
+          },
+        }
+      );
+    });
+    await visit(urls.hostCatalog);
+    await click('form [type="button"]', 'Activate edit mode');
+    await fillIn('[name="name"]', 'random string');
+    await click('[type="submit"]');
+    assert.ok(
+      find('[role="alert"]').textContent.trim(),
+      'The request was invalid.'
+    );
+    assert.ok(
+      find('.rose-form-error-message').textContent.trim(),
+      'Name is required.'
+    );
+  });
+
+  test('can discard unsaved host catalog changes via dialog', async function (assert) {
+    assert.expect(5);
+    const confirmService = this.owner.lookup('service:confirm');
+    confirmService.enabled = true;
+    assert.notEqual(instances.hostCatalog.name, 'random string');
+    await visit(urls.hostCatalog);
+    await click('form [type="button"]', 'Activate edit mode');
+    await fillIn('[name="name"]', 'random string');
+    assert.equal(currentURL(), urls.hostCatalog);
+    try {
+      await visit(urls.hostCatalogs);
+    } catch (e) {
+      assert.ok(find('.rose-dialog'));
+      await click('.rose-dialog-footer button:first-child');
+      assert.equal(currentURL(), urls.hostCatalogs);
+      assert.notEqual(
+        this.server.schema.hostCatalogs.all().models[0].name,
+        'random string'
+      );
+    }
+  });
+
+  test('can cancel discard unsaved host catalog changes via dialog', async function (assert) {
+    assert.expect(5);
+    const confirmService = this.owner.lookup('service:confirm');
+    confirmService.enabled = true;
+    assert.notEqual(instances.hostCatalog.name, 'random string');
+    await visit(urls.hostCatalog);
+    await click('form [type="button"]', 'Activate edit mode');
+    await fillIn('[name="name"]', 'random string');
+    assert.equal(currentURL(), urls.hostCatalog);
+    try {
+      await visit(urls.hostCatalogs);
+    } catch (e) {
+      assert.ok(find('.rose-dialog'));
+      await click('.rose-dialog-footer button:last-child');
+      assert.equal(currentURL(), urls.hostCatalog);
+      assert.notEqual(
+        this.server.schema.hostCatalogs.all().models[0].name,
+        'random string'
+      );
+    }
+  });
+});

From e7db3cb3272bd1b264f902df9c66d7da5f90213a Mon Sep 17 00:00:00 2001
From: dharini <dharini@hashicorp.com>
Date: Thu, 19 Aug 2021 16:17:54 -0700
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=F0=9F=90=9B=20restructure=20tests?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tests/acceptance/host-catalogs-test.js    | 173 ------------------
 1 file changed, 173 deletions(-)

diff --git a/ui/admin/tests/acceptance/host-catalogs-test.js b/ui/admin/tests/acceptance/host-catalogs-test.js
index 0213bc5ce..fea885978 100644
--- a/ui/admin/tests/acceptance/host-catalogs-test.js
+++ b/ui/admin/tests/acceptance/host-catalogs-test.js
@@ -2,10 +2,7 @@ import { module, test } from 'qunit';
 import { visit, currentURL, find, click, fillIn } from '@ember/test-helpers';
 import { setupApplicationTest } from 'ember-qunit';
 import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
-import a11yAudit from 'ember-a11y-testing/test-support/audit';
 import { Response } from 'miragejs';
-import { resolve, reject } from 'rsvp';
-import sinon from 'sinon';
 import {
   authenticateSession,
   // These are left here intentionally for future reference.
@@ -63,23 +60,6 @@ module('Acceptance | host-catalogs', function (hooks) {
     authenticateSession({});
   });
 
-  test('visiting host catalogs', async function (assert) {
-    assert.expect(2);
-    await visit(urls.hostCatalogs);
-    await a11yAudit();
-    assert.equal(currentURL(), urls.hostCatalogs);
-    await visit(urls.hostCatalog);
-    await a11yAudit();
-    assert.equal(currentURL(), urls.hostCatalog);
-  });
-
-  test('visiting an unknown host catalog displays 404 message', async function (assert) {
-    assert.expect(1);
-    await visit(urls.unknownHostCatalog);
-    await a11yAudit();
-    assert.ok(find('.rose-message-subtitle').textContent.trim(), 'Error 404');
-  });
-
   test('can create new host catalogs', async function (assert) {
     assert.expect(1);
     const count = gethostCatalogCount();
@@ -131,157 +111,4 @@ module('Acceptance | host-catalogs', function (hooks) {
       'Name is required.'
     );
   });
-
-  test('can save changes to existing host catalog', async function (assert) {
-    assert.expect(3);
-    assert.notEqual(instances.hostCatalog.name, 'random string');
-    await visit(urls.hostCatalog);
-    await click('form [type="button"]', 'Activate edit mode');
-    await fillIn('[name="name"]', 'random string');
-    await click('.rose-form-actions [type="submit"]');
-    assert.equal(currentURL(), urls.hostCatalog);
-    assert.equal(
-      this.server.schema.hostCatalogs.all().models[0].name,
-      'random string'
-    );
-  });
-
-  test('can cancel changes to existing host catalog', async function (assert) {
-    assert.expect(2);
-    await visit(urls.hostCatalog);
-    await click('form [type="button"]', 'Activate edit mode');
-    await fillIn('[name="name"]', 'random string');
-    await click('.rose-form-actions [type="button"]');
-    assert.notEqual(instances.hostCatalog.name, 'random string');
-    assert.equal(find('[name="name"]').value, instances.hostCatalog.name);
-  });
-
-  test('saving an existing host catalog with invalid fields displays error messages', async function (assert) {
-    assert.expect(2);
-    this.server.patch('/host-catalogs/:id', () => {
-      return new Response(
-        400,
-        {},
-        {
-          status: 400,
-          code: 'invalid_argument',
-          message: 'The request was invalid.',
-          details: {
-            request_fields: [
-              {
-                name: 'name',
-                description: 'Name is required.',
-              },
-            ],
-          },
-        }
-      );
-    });
-    await visit(urls.hostCatalog);
-    await click('form [type="button"]', 'Activate edit mode');
-    await fillIn('[name="name"]', 'random string');
-    await click('[type="submit"]');
-    assert.ok(
-      find('[role="alert"]').textContent.trim(),
-      'The request was invalid.'
-    );
-    assert.ok(
-      find('.rose-form-error-message').textContent.trim(),
-      'Name is required.'
-    );
-  });
-
-  test('can discard unsaved host catalog changes via dialog', async function (assert) {
-    assert.expect(5);
-    const confirmService = this.owner.lookup('service:confirm');
-    confirmService.enabled = true;
-    assert.notEqual(instances.hostCatalog.name, 'random string');
-    await visit(urls.hostCatalog);
-    await click('form [type="button"]', 'Activate edit mode');
-    await fillIn('[name="name"]', 'random string');
-    assert.equal(currentURL(), urls.hostCatalog);
-    try {
-      await visit(urls.hostCatalogs);
-    } catch (e) {
-      assert.ok(find('.rose-dialog'));
-      await click('.rose-dialog-footer button:first-child');
-      assert.equal(currentURL(), urls.hostCatalogs);
-      assert.notEqual(
-        this.server.schema.hostCatalogs.all().models[0].name,
-        'random string'
-      );
-    }
-  });
-
-  test('can cancel discard unsaved host catalog changes via dialog', async function (assert) {
-    assert.expect(5);
-    const confirmService = this.owner.lookup('service:confirm');
-    confirmService.enabled = true;
-    assert.notEqual(instances.hostCatalog.name, 'random string');
-    await visit(urls.hostCatalog);
-    await click('form [type="button"]', 'Activate edit mode');
-    await fillIn('[name="name"]', 'random string');
-    assert.equal(currentURL(), urls.hostCatalog);
-    try {
-      await visit(urls.hostCatalogs);
-    } catch (e) {
-      assert.ok(find('.rose-dialog'));
-      await click('.rose-dialog-footer button:last-child');
-      assert.equal(currentURL(), urls.hostCatalog);
-      assert.notEqual(
-        this.server.schema.hostCatalogs.all().models[0].name,
-        'random string'
-      );
-    }
-  });
-
-  test('can delete host catalog', async function (assert) {
-    assert.expect(1);
-    const count = gethostCatalogCount();
-    await visit(urls.hostCatalog);
-    await click('.rose-layout-page-actions .rose-dropdown-button-danger');
-    assert.equal(gethostCatalogCount(), count - 1);
-  });
-
-  test('can accept delete host catalog via dialog', async function (assert) {
-    assert.expect(2);
-    const confirmService = this.owner.lookup('service:confirm');
-    confirmService.enabled = true;
-    confirmService.confirm = sinon.fake.returns(resolve());
-    const count = gethostCatalogCount();
-    await visit(urls.hostCatalog);
-    await click('.rose-layout-page-actions .rose-dropdown-button-danger');
-    assert.equal(gethostCatalogCount(), count - 1);
-    assert.ok(confirmService.confirm.calledOnce);
-  });
-
-  test('cannot cancel delete host catalog via dialog', async function (assert) {
-    assert.expect(2);
-    const confirmService = this.owner.lookup('service:confirm');
-    confirmService.enabled = true;
-    confirmService.confirm = sinon.fake.returns(reject());
-    const count = gethostCatalogCount();
-    await visit(urls.hostCatalog);
-    await click('.rose-layout-page-actions .rose-dropdown-button-danger');
-    assert.equal(gethostCatalogCount(), count);
-    assert.ok(confirmService.confirm.calledOnce);
-  });
-
-  test('deleting a host catalog which errors displays error messages', async function (assert) {
-    assert.expect(1);
-    this.server.del('/host-catalogs/:id', () => {
-      return new Response(
-        490,
-        {},
-        {
-          status: 490,
-          code: 'error',
-          message: 'Oops.',
-        }
-      );
-    });
-    await visit(urls.hostCatalog);
-    await click('.rose-layout-page-actions .rose-dropdown-button-danger');
-    assert.ok(find('[role="alert"]').textContent.trim(), 'Oops.');
-  });
 });

From c3381bc6fcaa2e57f7756cc6d86e700bf3badbce Mon Sep 17 00:00:00 2001
From: dharini <dharini@hashicorp.com>
Date: Fri, 20 Aug 2021 10:39:58 -0700
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=F0=9F=90=9B=20add=20else=20block?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/admin/app/templates/scopes/scope/host-catalogs/index.hbs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/index.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/index.hbs
index c118c4035..734825303 100644
--- a/ui/admin/app/templates/scopes/scope/host-catalogs/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/host-catalogs/index.hbs
@@ -48,6 +48,8 @@
                   >
                     {{hostCatalog.displayName}}
                   </LinkTo>
+                {{else}}
+                  {{hostCatalog.displayName}}
                 {{/if}}
                 <p>{{hostCatalog.description}}</p>
               </row.headerCell>