Merge branch 'main' into add-align-attr

addons/core/translations/resources/en-us.yaml

@@ -271,3 +271,11 @@ credential-store:
   title: Credential Store
   title_plural: Credential Stores
   description: A credential stores is a collection of credentials and credential libraries.
+credential-library:
+  title: Credential Library
+  title_plural: Credential Libraries
+  description: A credential library is a resource that provides credentials.
+  messages:
+    none:
+      title: No Credential Libraries Available
+      description: No Credential Libraries available in this credential store.

ui/admin/app/components/form/credential-store/index.hbs

@@ -2,6 +2,7 @@
   @onSubmit={{@submit}}
   @cancel={{@cancel}}
   @disabled={{@model.isSaving}}
+  @error={{@model.errors.base}}
   @showEditToggle={{if @model.isNew false true}}
   as |form|
 >
@@ -18,16 +19,38 @@
     @value={{@model.name}}
     @label={{t 'form.name.label'}}
     @helperText={{t 'form.name.help'}}
+    @error={{@model.errors.name}}
     readonly={{false}}
-  />
+    as |field|
+  >
+    {{#if @model.errors.name}}
+      <field.errors as |errors|>
+        {{#each @model.errors.name as |error|}}
+          <errors.message>{{error.message}}</errors.message>
+        {{/each}}
+      </field.errors>
+    {{/if}}
+  </form.input>
 
   <form.textarea
     @name='description'
     @type='description'
     @value={{@model.description}}
     @label={{t 'form.description.label'}}
+    @error={{@model.errors.description}}
     @helperText={{t 'form.description.help'}}
-  />
+    disabled={{@model.isSaving}}
+    readonly={{false}}
+    as |field|
+  >
+    {{#if @model.errors.description}}
+      <field.errors as |errors|>
+        {{#each @model.errors.description as |error|}}
+          <errors.message>{{error.message}}</errors.message>
+        {{/each}}
+      </field.errors>
+    {{/if}}
+  </form.textarea>
 
   <form.actions
     @disabled={{if @model.cannotSave @model.cannotSave}}

ui/admin/app/router.js

@@ -90,7 +90,9 @@ Router.map(function () {
         this.route(
           'credential-store',
           { path: ':credential_store_id' },
-          function () {}
+          function () {
+            this.route('credential-libraries', function () {});
+          }
         );
         this.route('new');
       });

ui/admin/app/routes/scopes/scope/credential-stores/credential-store/credential-libraries.js

@@ -0,0 +1,16 @@
+import Route from '@ember/routing/route';
+
+export default class ScopesScopeCredentialStoresCredentialStoreCredentialLibrariesRoute extends Route {
+  // =methods
+
+  /**
+   * Loads all credential libraries under the current credential store.
+   * @return {Promise{[CredentialLibraryModel]}}
+   */
+  model() {
+    const { id: credential_store_id } = this.modelFor(
+      'scopes.scope.credential-stores.credential-store'
+    );
+    return this.store.query('credential-library', { credential_store_id });
+  }
+}

ui/admin/app/routes/scopes/scope/credential-stores/credential-store/credential-libraries/index.js

@@ -0,0 +1,3 @@
+import Route from '@ember/routing/route';
+
+export default class ScopesScopeCredentialStoresCredentialStoreCredentialLibrariesIndexRoute extends Route {}

ui/admin/app/templates/scopes/scope/credential-stores/credential-store/-navigation.hbs

@@ -2,4 +2,9 @@
   <nav.link @route='scopes.scope.credential-stores.credential-store.index'>
     {{t 'titles.details'}}
   </nav.link>
+  <nav.link
+    @route='scopes.scope.credential-stores.credential-store.credential-libraries'
+  >
+    {{t 'resources.credential-library.title_plural'}}
+  </nav.link>
 </Rose::Nav::Tabs>

ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credential-libraries.hbs

@@ -0,0 +1,3 @@
+{{page-title (t 'resources.credential-library.title_plural')}}
+
+{{outlet}}

ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credential-libraries/index.hbs

@@ -0,0 +1,44 @@
+{{#if @model}}
+
+  <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>
+      </header.row>
+    </table.header>
+    <table.body as |body|>
+      {{#each @model as |credentialLibrary|}}
+        <body.row as |row|>
+          <row.headerCell>
+            {{credentialLibrary.displayName}}
+            <p>{{credentialLibrary.description}}</p>
+          </row.headerCell>
+          <row.cell>
+            <Copyable
+              @text={{credentialLibrary.id}}
+              @buttonText={{t 'actions.copy-to-clipboard'}}
+              @acknowledgeText={{t 'states.copied'}}
+            >
+              <code>{{credentialLibrary.id}}</code>
+            </Copyable>
+          </row.cell>
+        </body.row>
+      {{/each}}
+    </table.body>
+  </Rose::Table>
+
+{{else}}
+
+  <Rose::Layout::Centered>
+    <Rose::Message
+      @title={{t 'resources.credential-library.messages.none.title'}}
+      as |message|
+    >
+      <message.description>
+        {{t 'resources.credential-library.messages.none.description'}}
+      </message.description>
+    </Rose::Message>
+  </Rose::Layout::Centered>
+
+{{/if}}

ui/admin/tests/acceptance/credential-stores-test.js

@@ -1,13 +1,17 @@
 import { module, test } from 'qunit';
-import { visit, currentURL } from '@ember/test-helpers';
+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 { authenticateSession } from 'ember-simple-auth/test-support';
+import { Response } from 'miragejs';
 
 module('Acceptance | credential-stores', function (hooks) {
   setupApplicationTest(hooks);
   setupMirage(hooks);
 
+  let getCredentialStoresCount;
+
   const instances = {
     scopes: {
       global: null,
@@ -18,7 +22,12 @@ module('Acceptance | credential-stores', function (hooks) {
 
   const urls = {
     globalScope: null,
+    orgScope: null,
+    projectScope: null,
     credentialStores: null,
+    credentialStore: null,
+    unknownCredentialStore: null,
+    newCredentialStore: null,
   };
 
   hooks.beforeEach(function () {
@@ -32,17 +41,199 @@ module('Acceptance | credential-stores', function (hooks) {
       type: 'project',
       scope: { id: instances.scopes.org.id, type: 'org' },
     });
+    instances.credentialStore = this.server.create('credential-store', {
+      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.credentialStores = `${urls.projectScope}/credential-stores`;
+    urls.credentialStore = `${urls.credentialStores}/${instances.credentialStore.id}`;
+    urls.unknownCredentialStore = `${urls.credentialStores}/foo`;
+    urls.newCredentialStore = `${urls.credentialStores}/new`;
+    // Generate resource counter
+    getCredentialStoresCount = () => {
+      return this.server.schema.credentialStores.all().models.length;
+    };
+    authenticateSession({});
   });
 
   test('visiting /credential-stores', async function (assert) {
-    assert.expect(1);
+    assert.expect(2);
     await visit(urls.credentialStores);
     await a11yAudit();
     assert.equal(currentURL(), urls.credentialStores);
+    await visit(urls.credentialStore);
+    await a11yAudit();
+    assert.equal(currentURL(), urls.credentialStore);
+  });
+
+  test('visiting an unknown credential store display 404 message', async function (assert) {
+    assert.expect(1);
+    await visit(urls.unknownCredentialStore);
+    await a11yAudit();
+    assert.equal(
+      find('.rose-message-subtitle').textContent.trim(),
+      'Error 404'
+    );
+  });
+
+  test('can create a new credential stores', async function (assert) {
+    assert.expect(1);
+    const count = getCredentialStoresCount();
+    await visit(urls.newCredentialStore);
+    await fillIn('[name="name"]', 'random string');
+    await click('[type="submit"]');
+    assert.equal(getCredentialStoresCount(), count + 1);
+  });
+
+  test('can cancel create new credential stores', async function (assert) {
+    assert.expect(2);
+    const count = getCredentialStoresCount();
+    await visit(urls.newCredentialStore);
+    await fillIn('[name="name"]', 'random string');
+    await click('.rose-form-actions [type="button"]');
+    assert.equal(currentURL(), urls.credentialStores);
+    assert.equal(getCredentialStoresCount(), count);
+  });
+
+  test('saving a new credential store with invalid fields displays error messages', async function (assert) {
+    assert.expect(2);
+    this.server.post('/credential-stores', () => {
+      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.newCredentialStore);
+    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 save changes to existing credential store', async function (assert) {
+    assert.expect(3);
+    assert.notEqual(instances.credentialStore.name, 'random string');
+    await visit(urls.credentialStore);
+    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.credentialStore);
+    assert.equal(
+      this.server.schema.credentialStores.all().models[0].name,
+      'random string'
+    );
+  });
+
+  test('can cancel changes to existing credential store', async function (assert) {
+    assert.expect(2);
+    await visit(urls.credentialStore);
+    await click('form [type="button"]', 'Activate edit mode');
+    await fillIn('[name="name"]', 'random string');
+    await click('.rose-form-actions [type="button"]');
+    assert.notEqual(instances.credentialStore.name, 'random string');
+    assert.equal(find('[name="name"]').value, instances.credentialStore.name);
+  });
+
+  test('saving an existing credential store with invalid fields displays error messages', async function (assert) {
+    assert.expect(2);
+    this.server.patch('/credential-stores/: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.credentialStore);
+    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 credential store changes via dialog', async function (assert) {
+    assert.expect(5);
+    const confirmService = this.owner.lookup('service:confirm');
+    confirmService.enabled = true;
+    assert.notEqual(instances.credentialStore.name, 'random string');
+
+    await visit(urls.credentialStore);
+    await click('form [type="button"]', 'Activate edit mode');
+    await fillIn('[name="name"]', 'random string');
+    assert.equal(currentURL(), urls.credentialStore);
+
+    try {
+      await visit(urls.credentialStores);
+    } catch (e) {
+      assert.ok(find('.rose-dialog'));
+      await click('.rose-dialog-footer button:first-child', 'Click Discard');
+      assert.equal(currentURL(), urls.credentialStores);
+      assert.notEqual(
+        this.server.schema.credentialStores.all().models[0].name,
+        'random string'
+      );
+    }
+  });
+
+  test('can cancel discard unsaved credential store via dialog', async function (assert) {
+    assert.expect(5);
+    const confirmService = this.owner.lookup('service:confirm');
+    confirmService.enabled = true;
+    assert.notEqual(instances.credentialStore.name, 'random string');
+    await visit(urls.credentialStore);
+    await click('form [type="button"]', 'Activate edit mode');
+    await fillIn('[name="name"]', 'random string');
+    assert.equal(currentURL(), urls.credentialStore);
+
+    try {
+      await visit(urls.credentialStores);
+    } catch (e) {
+      assert.ok(find('.rose-dialog'));
+      await click('.rose-dialog-footer button:last-child');
+      assert.equal(currentURL(), urls.credentialStore);
+      assert.notEqual(
+        this.server.schema.credentialStores.all().models[0].name,
+        'random string'
+      );
+    }
   });
 });

ui/admin/tests/unit/routes/scopes/scope/credential-stores/credential-store/credential-libraries-test.js

@@ -0,0 +1,16 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module(
+  'Unit | Route | scopes/scope/credential-stores/credential-store/credential-libraries',
+  function (hooks) {
+    setupTest(hooks);
+
+    test('it exists', function (assert) {
+      let route = this.owner.lookup(
+        'route:scopes/scope/credential-stores/credential-store/credential-libraries'
+      );
+      assert.ok(route);
+    });
+  }
+);

ui/admin/tests/unit/routes/scopes/scope/credential-stores/credential-store/credential-libraries/index-test.js

@@ -0,0 +1,16 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module(
+  'Unit | Route | scopes/scope/credential-stores/credential-store/credential-libraries/index',
+  function (hooks) {
+    setupTest(hooks);
+
+    test('it exists', function (assert) {
+      let route = this.owner.lookup(
+        'route:scopes/scope/credential-stores/credential-store/credential-libraries/index'
+      );
+      assert.ok(route);
+    });
+  }
+);