Merge branch 'develop' into ICU-480-simplified-table-styles

ui/core/app/components/form/auth-method/index.hbs

@@ -0,0 +1,53 @@
+<Rose::Form
+  @onSubmit={{@submit}}
+  @cancel={{@cancel}}
+  @disabled={{@model.isSaving}}
+  @error={{@model.errors.base}}
+  as |form|
+>
+  <form.input
+  @value={{t (concat 'auth.method-types.' @model.type)}}
+  @label={{t "form.label.type"}}
+  readonly={{true}}
+  @disabled={{true}} />
+
+  <form.input
+    @name="name"
+    @type="name"
+    @value={{@model.name}}
+    @label={{t "form.label.name"}}
+    @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.label.description"}}
+    @error={{@model.errors.description}}
+    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}}
+    @submitText={{t "actions.save"}}
+    @cancelText={{t "actions.cancel"}} />
+</Rose::Form>

ui/core/app/controllers/scopes/scope/auth-methods.js

@@ -0,0 +1,18 @@
+import Controller from '@ember/controller';
+import { inject as service } from '@ember/service';
+
+export default class ScopesScopeAuthMethodsController extends Controller {
+  // =services
+
+  @service intl;
+
+  // =attributes
+
+  /**
+   * Translated auth-methods breadcrumb
+   * @type {string}
+   */
+  get breadCrumb() {
+    return this.intl.t('resources.auth-methods');
+  }
+}

ui/core/app/controllers/scopes/scope/auth-methods/auth-method.js

@@ -0,0 +1,13 @@
+import Controller from '@ember/controller';
+
+export default class ScopesScopeAuthMethodsAuthMethodController extends Controller {
+  // =attributes
+
+  /**
+   * An auth-method breadcrumb
+   * @type {string}
+   */
+  get breadCrumb() {
+    return this.model.displayName;
+  }
+}

ui/core/app/controllers/scopes/scope/auth-methods/new.js

@@ -0,0 +1,18 @@
+import Controller from '@ember/controller';
+import { inject as service } from '@ember/service';
+
+export default class ScopesScopeAuthMethodsNewController extends Controller {
+  // =services
+
+  @service intl;
+
+  // =attributes
+
+  /**
+   * Translated new auth-method breadcrumb
+   * @type {string}
+   */
+  get breadCrumb() {
+    return this.intl.t('titles.new');
+  }
+}

ui/core/app/router.js

@@ -36,7 +36,10 @@ Router.map(function () {
         });
         this.route('new');
       });
-      this.route('auth-methods', function() {});
+      this.route('auth-methods', function() {
+        this.route('auth-method', { path: ':auth_method_id' }, function() {});
+        this.route('new');
+      });
     });
   });
 });

ui/core/app/routes/scopes/scope/auth-methods.js

@@ -1,6 +1,13 @@
 import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
+import { action } from '@ember/object';
 
 export default class ScopesScopeAuthMethodsRoute extends Route {
+  // =services
+
+  @service intl;
+  @service notify;
+
   // =methods
 
   /**
@@ -11,4 +18,36 @@ export default class ScopesScopeAuthMethodsRoute extends Route {
     const { id: scopeID} = this.modelFor('scopes.scope');
     return this.store.findAll('auth-method', { adapterOptions: { scopeID } });
   }
+
+  // =actions
+  /**
+   * Rollback changes to an auth-method.
+   * @param {AuthMethodModel} authMethod
+   */
+  @action
+  cancel(authMethod) {
+    const { isNew } = authMethod;
+    authMethod.rollbackAttributes();
+    if (isNew) this.transitionTo('scopes.scope.auth-methods');
+  }
+
+  /**
+   * Save an auth-method in current scope.
+   * @param {AuthMethodModel} authMethod
+   */
+  @action
+  async save(authMethod) {
+    const { isNew } = authMethod;
+    try {
+      await authMethod.save();
+      this.refresh();
+      this.notify.success(
+        this.intl.t(isNew ? 'notify.create-success' : 'notify.save-success')
+      );
+      this.transitionTo('scopes.scope.auth-methods.auth-method', authMethod);
+    } catch (error) {
+      //TODO: replace with translated strings
+      this.notify.error(error.message, { closeAfter: null });
+    }
+  }
 }

ui/core/app/routes/scopes/scope/auth-methods/auth-method.js

@@ -0,0 +1,16 @@
+import Route from '@ember/routing/route';
+
+export default class ScopesScopeAuthMethodsAuthMethodRoute extends Route {
+  // =methods
+
+  /**
+   * Load a single auth-method in current scope.
+   * @param {object} params
+   * @param {string} params.auth_method_id
+   * @return {authMethodModel}
+   */
+  async model({ auth_method_id}) {
+    const { id: scopeID } = this.modelFor('scopes.scope');
+    return this.store.findRecord('auth-method', auth_method_id, { adapterOptions: { scopeID }});
+  }
+}

ui/core/app/routes/scopes/scope/auth-methods/auth-method/index.js

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

ui/core/app/routes/scopes/scope/auth-methods/new.js

@@ -0,0 +1,14 @@
+import Route from '@ember/routing/route';
+
+export default class ScopesScopeAuthMethodsNewRoute extends Route {
+  // =methods
+
+  /**
+   * Create a new unsaved auth-method.
+   * @return {AuthMethodModel}
+   */
+  model() {
+    const scopeModel = this.modelFor('scopes.scope');
+    return this.store.createRecord('auth-method', { type: 'password', scopeModel });
+  }
+}

ui/core/app/templates/scopes/scope/auth-methods/auth-method.hbs

@@ -0,0 +1 @@
+{{outlet}}

ui/core/app/templates/scopes/scope/auth-methods/auth-method/index.hbs

@@ -0,0 +1,28 @@
+<Rose::Layout::Page as |page|>
+  <page.header>
+    <h2>{{t "resources.auth-method"}}</h2>
+    <Rose::Badge @style="outline">
+      {{t (concat 'auth.method-types.' @model.type)}}
+    </Rose::Badge>
+  </page.header>
+
+  <page.breadcrumbs>
+    <BreadCrumbs />
+  </page.breadcrumbs>
+
+  <page.navigation>
+    <Rose::Nav::Tabs as |nav|>
+      <nav.link @route='scopes.scope.auth-methods.auth-method'>
+        {{t 'titles.details'}}
+      </nav.link>
+    </Rose::Nav::Tabs>
+  </page.navigation>
+
+  <page.body>
+    <Form::AuthMethod
+      @model={{@model}}
+      @submit={{route-action "save" @model}}
+      @cancel={{route-action "cancel" @model}}
+    />
+  </page.body>
+</Rose::Layout::Page>

ui/core/app/templates/scopes/scope/auth-methods/index.hbs

@@ -3,6 +3,18 @@
     <h2>{{t "resources.auth-methods"}}</h2>
   </page.header>
 
+  <page.breadcrumbs>
+    <BreadCrumbs />
+  </page.breadcrumbs>
+
+  <page.actions>
+    {{#if @model}}
+      <Rose::LinkButton @route="scopes.scope.auth-methods.new" @style="primary">
+        {{t "titles.new"}}
+      </Rose::LinkButton>
+    {{/if}}
+  </page.actions>
+
   <page.body>
     {{#if @model}}
 
@@ -19,12 +31,17 @@
           {{#each @model as |authMethod|}}
             <body.row as |row|>
               <row.cell>
-                {{authMethod.name}}
-                {{authMethod.description}}
+                <LinkTo
+                  @route="scopes.scope.auth-methods.auth-method"
+                  @model={{authMethod}}
+                >
+                  {{authMethod.name}}
+                </LinkTo>
+                <p>{{authMethod.description}}</p>
               </row.cell>
               <row.cell>
                 <Rose::Badge @style="outline">
-                  {{authMethod.type}}
+                  {{t (concat 'auth.method-types.' authMethod.type)}}
                 </Rose::Badge>
               </row.cell>
               <row.cell>{{authMethod.id}}</row.cell>
@@ -40,6 +57,10 @@
           <message.description>
             {{t 'descriptions.auth-methods-welcome'}}
           </message.description>
+          <message.link @route="scopes.scope.auth-methods.new">
+            <Rose::Icon @name="plus-circle-outline" />
+            {{t 'titles.new'}}
+          </message.link>
         </Rose::Message>
       </Rose::Layout::Centered>
 

ui/core/app/templates/scopes/scope/auth-methods/new.hbs

@@ -0,0 +1,19 @@
+{{title (t "titles.new")}}
+
+<Rose::Layout::Page as |page|>
+  <page.header>
+    <h2>{{t "titles.new"}}</h2>
+  </page.header>
+
+  <page.breadcrumbs>
+    <BreadCrumbs />
+  </page.breadcrumbs>
+
+  <page.body>
+    <Form::AuthMethod
+      @model={{@model}}
+      @submit={{route-action "save" @model}}
+      @cancel={{route-action "cancel" @model}}
+    />
+  </page.body>
+</Rose::Layout::Page>

ui/core/tests/acceptance/auth-methods-test.js

@@ -0,0 +1,94 @@
+import { module, test } from 'qunit';
+import { visit, currentURL } 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 | auth methods', function (hooks) {
+  setupApplicationTest(hooks);
+  setupMirage(hooks);
+
+  const instances = {
+    scopes: {
+      global: null,
+      org: null
+    },
+    authMethod: null
+  };
+  const urls = {
+    orgScope: null,
+    authMethods: null
+  };
+
+  hooks.beforeEach(function () {
+    // Setup Mirage mock resources for this test
+    instances.scopes.global = this.server.create('scope', { id: 'global' });
+    instances.scopes.org = this.server.create('scope', { type: 'org',
+      scope: { id: instances.scopes.global.id, type: instances.scopes.global.type }
+    });
+    instances.authMethod = this.server.create('auth-method', {
+      scope: {
+        id: instances.scopes.org.id,
+        type: instances.scopes.org.type
+      }
+    });
+
+    // Generate route URLs for resources
+    urls.orgScope = `/scopes/${instances.scopes.org.id}`;
+    urls.authMethods = `${urls.orgScope}/auth-methods`;
+  });
+
+  test('visiting auth methods', async function (assert) {
+    assert.expect(1);
+    authenticateSession();
+    await visit(urls.authMethods);
+    await a11yAudit();
+    assert.equal(currentURL(), urls.authMethods);
+  });
+
+  test('can navigate to an auth method form', async function (assert) {
+    assert.expect(0);
+  });
+
+  test('can update an auth method and save changes', async function (assert) {
+    assert.expect(0);
+  });
+
+  test('can update an auth method and cancel changes', async function (assert) {
+    assert.expect(0);
+  });
+
+  test('can create new auth method', async function (assert) {
+    assert.expect(0);
+  });
+
+  test('can cancel new auth method creation', async function (assert) {
+    assert.expect(0);
+  });
+
+  test('saving a new auth method with invalid fields displays error messages', async function (assert) {
+    assert.expect(0);
+  });
+
+  test('errors are displayed when save on auth method fails', async function (assert) {
+    assert.expect(0);
+  });
+
+  test('errors are displayed when delete on an auth method fails', async function (assert) {
+    assert.expect(0);
+  });
+
+  test('saving a new auth method with invalid fields displays error messages', async function (assert) {
+    assert.expect(0);
+  });
+
+  test('saving an existing auth method with invalid fields displays error messages', async function (assert) {
+    assert.expect(0);
+  });
+});

ui/core/tests/integration/components/form/auth-method-test.js

@@ -0,0 +1,23 @@
+import { module, test } from 'qunit';
+import { setupRenderingTest } from 'ember-qunit';
+import { render, find } from '@ember/test-helpers';
+import { hbs } from 'ember-cli-htmlbars';
+
+module('Integration | Component | form/auth-method', function (hooks) {
+  setupRenderingTest(hooks);
+
+  test('it renders', async function (assert) {
+    this.submit = () => {};
+    this.cancel = () => {};
+    this.model = { type: 'password' };
+
+    await render(hbs`
+      <Form::AuthMethod
+        @model={{this.model}}
+        @submit={{this.submit}}
+        @cancel={{this.cancel}}
+      />`);
+
+    assert.ok(find('form'));
+  });
+});

ui/core/tests/unit/controllers/scopes/scope/auth-methods-test.js

@@ -0,0 +1,12 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Controller | scopes/scope/auth-methods', function(hooks) {
+  setupTest(hooks);
+
+  // Replace this with your real tests.
+  test('it exists', function(assert) {
+    let controller = this.owner.lookup('controller:scopes/scope/auth-methods');
+    assert.ok(controller);
+  });
+});

ui/core/tests/unit/controllers/scopes/scope/auth-methods/auth-method-test.js

@@ -0,0 +1,12 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Controller | scopes/scope/auth-methods/auth-method', function(hooks) {
+  setupTest(hooks);
+
+  // Replace this with your real tests.
+  test('it exists', function(assert) {
+    let controller = this.owner.lookup('controller:scopes/scope/auth-methods/auth-method');
+    assert.ok(controller);
+  });
+});

ui/core/tests/unit/controllers/scopes/scope/auth-methods/new-test.js

@@ -0,0 +1,12 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Controller | scopes/scope/auth-methods/new', function(hooks) {
+  setupTest(hooks);
+
+  // Replace this with your real tests.
+  test('it exists', function(assert) {
+    let controller = this.owner.lookup('controller:scopes/scope/auth-methods/new');
+    assert.ok(controller);
+  });
+});

ui/core/tests/unit/routes/scopes/scope/auth-methods/auth-method-test.js

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

ui/core/tests/unit/routes/scopes/scope/auth-methods/auth-method/index-test.js

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

ui/core/tests/unit/routes/scopes/scope/auth-methods/new-test.js

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

ui/core/translations/en-us.yaml

@@ -31,6 +31,7 @@ resources:
   project: Project
   host-catalog: Host Catalog
   host-catalogs: Host Catalogs
+  auth-method: Auth Method
   auth-methods: Auth Methods
 titles:
   iam: IAM