Merge pull request #129 from hashicorp/ICU-513-targets

Add basic target model and routes
This commit is contained in:
Randall Morey authored and GitHub committed 2020-08-21 16:26:25 -04:00
commit 9fab626d24
38 files changed
+647 -3

No files matched your search

@@ -0,0 +1,41 @@
import BaseModel from '../../models/base';
import { attr } from '@ember-data/model';
/**
* Target
*/
export default class GeneratedTargetModel extends BaseModel {
// =attributes
@attr('string', {
description: 'The protocol used in the target'
}) protocol;
@attr('string', {
description: 'Optional name for identification purposes'
}) name;
@attr('string', {
description: 'Optional user-set description for identification purposes'
}) description;
@attr('date', {
description: 'The time this resource was created\nOutput only.',
readOnly: true
}) created_time;
@attr('date', {
description: 'The time this resource was last updated\nOutput only.',
readOnly: true
}) updated_time;
@attr('boolean', {
description: 'Whether the catalog is disabled'
}) disabled;
@attr('number', {
description: 'Current version number of this resource.',
})
version;
}
+3
View File
@@ -0,0 +1,3 @@
import GeneratedTargetModel from '../generated/models/target';
export default class TargetModel extends GeneratedTargetModel {}
+1
View File
@@ -0,0 +1 @@
export { default } from 'api/models/target';
@@ -0,0 +1,13 @@
import { module, test } from 'qunit';
import { setupTest } from 'ember-qunit';
module('Unit | Model | target', function(hooks) {
setupTest(hooks);
// Replace this with your real tests.
test('it exists', function(assert) {
let store = this.owner.lookup('service:store');
let model = store.createRecord('target', {});
assert.ok(model);
});
});
@@ -0,0 +1,49 @@
<Rose::Form
@onSubmit={{@submit}}
@cancel={{@cancel}}
@disabled={{@model.isSaving}}
@error={{@model.errors.base}}
as |form|
>
<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>
@@ -0,0 +1,20 @@
import Controller from '@ember/controller';
import { inject as service } from '@ember/service';
export default class ScopesScopeProjectsProjectTargetsController extends Controller {
// =services
@service intl;
// =attributes
/**
* Targets breadcrumb
* @type {string}
*/
get breadCrumb() {
return this.intl.t('resources.targets');
}
}
@@ -0,0 +1,20 @@
import Controller from '@ember/controller';
import { inject as service } from '@ember/service';
export default class ScopesScopeProjectsProjectTargetsNewController extends Controller {
// =services
@service intl;
// =attributes
/**
* Translated new target breadcrumb
* @type {string}
*/
get breadCrumb() {
return this.intl.t('titles.new');
}
}
@@ -0,0 +1,15 @@
import Controller from '@ember/controller';
export default class ScopesScopeProjectsProjectTargetsTargetController extends Controller {
// =attributes
/**
* A target breadcrumb
* @type {string}
*/
get breadCrumb() {
return this.model.displayName;
}
}
+4
View File
@@ -33,6 +33,10 @@ Router.map(function () {
});
});
});
this.route('targets', function() {
this.route('target', { path: ':target_id' }, function() {});
this.route('new');
});
});
this.route('new');
});
@@ -17,7 +17,7 @@ export default class ScopesScopeProjectsProjectHostCatalogsHostCatalogRoute exte
});
}
/**
/**
* Renders the host-catalog specific templates for header, navigation, and actions page sections.
* @override
* @param {object} controller
@@ -0,0 +1,74 @@
import Route from '@ember/routing/route';
import { inject as service } from '@ember/service';
import { action } from '@ember/object';
export default class ScopesScopeProjectsProjectTargetsRoute extends Route {
// =services
@service intl;
@service notify;
// =methods
/**
* Loads all targets under current project scope.
* @return {Promise{[TargetModel]}}
*/
async model() {
const scopeID = this.modelFor('scopes.scope.projects.project').id;
return this.store.findAll('target', { adapterOptions: { scopeID } });
}
// =actions
/**
* Rollback changes on a target.
* @param {TargetModel} target
*/
@action
cancel(target) {
const { isNew } = target;
target.rollbackAttributes();
if (isNew) this.transitionTo('scopes.scope.projects.project.targets');
}
/**
* Handle save.
* @param {TargetModel} target
* @param {Event} e
*/
@action
async save(target) {
const { isNew } = target;
try {
await target.save();
this.refresh();
this.notify.success(
this.intl.t(isNew ? 'notify.create-success' : 'notify.save-success')
);
this.transitionTo('scopes.scope.projects.project.targets.target', target);
} catch (error) {
// TODO: replace with translated strings
this.notify.error(error.message, { closeAfter: null });
}
}
/**
* Deletes a target and redirects to targets index.
* @param {TargetModel} target
*/
@action
async delete(target) {
try {
await target.destroyRecord();
this.refresh();
this.notify.success(this.intl.t('notify.delete-success'));
this.transitionTo('scopes.scope.projects.project.targets');
} catch (error) {
// TODO: replace with translated strings
this.notify.error(error.message, { closeAfter: null });
}
}
}
@@ -0,0 +1,4 @@
import Route from '@ember/routing/route';
export default class ScopesScopeProjectsProjectTargetsIndexRoute extends Route {
}
@@ -0,0 +1,16 @@
import Route from '@ember/routing/route';
export default class ScopesScopeProjectsProjectTargetsNewRoute extends Route {
// =methods
/**
* Creates a new unsaved target in current project scope.
* @return {TargetModel}
*/
model() {
const scopeModel = this.modelFor('scopes.scope.projects.project');
return this.store.createRecord('target', { scopeModel });
}
}
@@ -0,0 +1,18 @@
import Route from '@ember/routing/route';
export default class ScopesScopeProjectsProjectTargetsTargetRoute extends Route {
// =methods
/**
* Load a target.
* @param {object} params
* @param {string} params.target_id
* @return {TargetModel}
*/
async model({ target_id }) {
const { id: scopeID } = this.modelFor('scopes.scope.projects.project');
return this.store.findRecord('target', target_id, { adapterOptions: { scopeID } });
}
}
@@ -0,0 +1,4 @@
import Route from '@ember/routing/route';
export default class ScopesScopeProjectsProjectTargetsTargetIndexRoute extends Route {
}
@@ -1,4 +1,7 @@
<Rose::Nav::Sidebar @title={{t "titles.resources"}} as |nav|>
<nav.link @route="scopes.scope.projects.project.targets">
{{t "resources.targets"}}
</nav.link>
<nav.link @route="scopes.scope.projects.project.host-catalogs">
{{t "resources.host-catalogs"}}
</nav.link>
@@ -0,0 +1,3 @@
{{title (t "resources.targets")}}
{{outlet}}
@@ -0,0 +1,76 @@
<Rose::Layout::Page as |page|>
<page.breadcrumbs>
<BreadCrumbs />
</page.breadcrumbs>
<page.header>
<h2>{{t "resources.targets"}}</h2>
</page.header>
<page.actions>
{{#if @model}}
<Rose::LinkButton @route="scopes.scope.projects.project.targets.new" @style="primary">
{{t "titles.new"}}
</Rose::LinkButton>
{{/if}}
</page.actions>
<page.body>
{{#if @model}}
<Rose::Table as |table|>
<table.header as |header|>
<header.row as |row|>
<row.headerCell>{{t "form.label.name"}}</row.headerCell>
<row.headerCell>{{t "form.label.protocol"}}</row.headerCell>
<row.headerCell>{{t "form.label.id"}}</row.headerCell>
</header.row>
</table.header>
<table.body as |body|>
{{#each @model as |target|}}
<body.row as |row|>
<row.headerCell>
<LinkTo
@route="scopes.scope.projects.project.targets.target"
@model={{target}}
>
{{target.displayName}}
</LinkTo>
<p>{{target.description}}</p>
</row.headerCell>
<row.cell>
{{#if target.protocol}}
<Rose::Badge @style="outline">
{{t (concat "target.protocols." target.protocol)}}
</Rose::Badge>
{{/if}}
</row.cell>
<row.cell>
<code>{{target.id}}</code>
</row.cell>
</body.row>
{{/each}}
</table.body>
</Rose::Table>
{{else}}
<Rose::Layout::Centered>
<Rose::Message @title={{t "titles.targets-welcome"}} as |message|>
<message.description>
{{t "descriptions.targets-welcome"}}
</message.description>
<message.link @route="scopes.scope.projects.project.targets.new">
<Rose::Icon @name="plus-circle-outline" />
{{t "titles.new"}}
</message.link>
</Rose::Message>
</Rose::Layout::Centered>
{{/if}}
</page.body>
</Rose::Layout::Page>
@@ -0,0 +1,21 @@
{{title (t 'titles.new')}}
<Rose::Layout::Page as |page|>
<page.breadcrumbs>
<BreadCrumbs />
</page.breadcrumbs>
<page.header>
<h2>{{t "titles.new"}}</h2>
</page.header>
<page.body>
<Form::Target
@model={{@model}}
@submit={{route-action "save" @model}}
@cancel={{route-action "cancel" @model}}
/>
</page.body>
</Rose::Layout::Page>
@@ -0,0 +1 @@
{{outlet}}
@@ -0,0 +1,39 @@
<Rose::Layout::Page as |page|>
<page.breadcrumbs>
<BreadCrumbs />
</page.breadcrumbs>
<page.header>
<h2>{{t "resources.target"}}</h2>
</page.header>
<page.navigation>
<Rose::Nav::Tabs as |nav|>
<nav.link @route='scopes.scope.projects.project.targets.target'>
{{t 'titles.details'}}
</nav.link>
</Rose::Nav::Tabs>
</page.navigation>
<page.actions>
<Rose::Dropdown @text="{{t 'form.label.manage'}}" @dropdownRight={{true}} as |dropdown|>
<dropdown.button
@style="danger"
@disabled={{@model.canSave}}
{{on "click" (route-action "delete" @model)}}
>
{{t 'actions.delete-target'}}
</dropdown.button>
</Rose::Dropdown>
</page.actions>
<page.body>
<Form::Target
@model={{@model}}
@submit={{route-action "save" @model}}
@cancel={{route-action "cancel" @model}}
/>
</page.body>
</Rose::Layout::Page>
+8
View File
@@ -123,6 +123,14 @@ export default function() {
return hostSet.update(attrs);
});
// target
this.get('/scopes/:scope_id/targets');
this.post('/scopes/:scope_id/targets');
this.get('/scopes/:scope_id/targets/:id');
this.patch('/scopes/:scope_id/targets/:id');
this.del('/scopes/:scope_id/targets/:id');
// Uncomment the following line and the Response import above
// Then change the response code to simulate error responses.
// this.get('/scopes/:scope_id/projects', () => new Response(505));
+3
View File
@@ -0,0 +1,3 @@
import factory from '../generated/factories/target';
export default factory.extend();
@@ -0,0 +1,17 @@
import { Factory } from 'ember-cli-mirage';
import { random, date } from 'faker';
/**
* GeneratedTargetModelFactory
*/
export default Factory.extend({
protocol: 'SSH',
name: () => random.words(),
description: () => random.words(),
created_time: () => date.recent(),
updated_time: () => date.recent(),
disabled: () => random.boolean(),
version: () => random.number(),
});
+2 -1
View File
@@ -33,6 +33,7 @@ export default function(server) {
server.db.scopes.where({type: 'project'}).forEach(({ id, type }) => {
const scope = { id, type };
server.createList('host-catalog', 2, { scope }, 'withChildren');
server.createList('target', 2, { scope });
});
}
+5
View File
@@ -0,0 +1,5 @@
import ApplicationSerializer from './application';
export default ApplicationSerializer.extend({
modelName: 'target'
});
+1 -1
View File
@@ -47,7 +47,7 @@ module('Acceptance | host sets', function (hooks) {
assert.expect(0);
});
test('errors are displayed when save on auth method fails', async function (assert) {
test('errors are displayed when save on host set fails', async function (assert) {
assert.expect(0);
});
+61
View File
@@ -0,0 +1,61 @@
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 | targets', function (hooks) {
setupApplicationTest(hooks);
setupMirage(hooks);
hooks.beforeEach(function () {
// Setup Mirage mock resources for this test
// Generate route URLs for resources
});
test('visiting targets', async function (assert) {
assert.expect(0);
});
test('can navigate to a target form', async function (assert) {
assert.expect(0);
});
test('can update a target and save changes', async function (assert) {
assert.expect(0);
});
test('can update a target and cancel changes', async function (assert) {
assert.expect(0);
});
test('can create new target', async function (assert) {
assert.expect(0);
});
test('can cancel new target creation', async function (assert) {
assert.expect(0);
});
test('saving a new target with invalid fields displays error messages', async function (assert) {
assert.expect(0);
});
test('errors are displayed when save on target fails', async function (assert) {
assert.expect(0);
});
test('errors are displayed when delete on a target fails', async function (assert) {
assert.expect(0);
});
test('saving an existing target with invalid fields displays error messages', async function (assert) {
assert.expect(0);
});
});
@@ -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/target', function (hooks) {
setupRenderingTest(hooks);
test('it renders', async function (assert) {
// Set any properties with this.set('myProperty', 'value');
// Handle any actions with this.set('myAction', function(val) { ... });
this.submit = () => {};
this.cancel = () => {};
await render(hbs`
<Form::Target
@submit={{this.submit}}
@cancel={{this.cancel}}
/>`);
assert.ok(find('form'));
});
});
@@ -0,0 +1,12 @@
import { module, test } from 'qunit';
import { setupTest } from 'ember-qunit';
module('Unit | Controller | scopes/scope/projects/project/targets', function(hooks) {
setupTest(hooks);
// Replace this with your real tests.
test('it exists', function(assert) {
let controller = this.owner.lookup('controller:scopes/scope/projects/project/targets');
assert.ok(controller);
});
});
@@ -0,0 +1,12 @@
import { module, test } from 'qunit';
import { setupTest } from 'ember-qunit';
module('Unit | Controller | scopes/scope/projects/project/targets/new', function(hooks) {
setupTest(hooks);
// Replace this with your real tests.
test('it exists', function(assert) {
let controller = this.owner.lookup('controller:scopes/scope/projects/project/targets/new');
assert.ok(controller);
});
});
@@ -0,0 +1,12 @@
import { module, test } from 'qunit';
import { setupTest } from 'ember-qunit';
module('Unit | Controller | scopes/scope/projects/project/targets/target', function(hooks) {
setupTest(hooks);
// Replace this with your real tests.
test('it exists', function(assert) {
let controller = this.owner.lookup('controller:scopes/scope/projects/project/targets/target');
assert.ok(controller);
});
});
@@ -0,0 +1,11 @@
import { module, test } from 'qunit';
import { setupTest } from 'ember-qunit';
module('Unit | Route | scopes/scope/projects/project/targets', function(hooks) {
setupTest(hooks);
test('it exists', function(assert) {
let route = this.owner.lookup('route:scopes/scope/projects/project/targets');
assert.ok(route);
});
});
@@ -0,0 +1,11 @@
import { module, test } from 'qunit';
import { setupTest } from 'ember-qunit';
module('Unit | Route | scopes/scope/projects/project/targets/index', function(hooks) {
setupTest(hooks);
test('it exists', function(assert) {
let route = this.owner.lookup('route:scopes/scope/projects/project/targets/index');
assert.ok(route);
});
});
@@ -0,0 +1,11 @@
import { module, test } from 'qunit';
import { setupTest } from 'ember-qunit';
module('Unit | Route | scopes/scope/projects/project/targets/new', function(hooks) {
setupTest(hooks);
test('it exists', function(assert) {
let route = this.owner.lookup('route:scopes/scope/projects/project/targets/new');
assert.ok(route);
});
});
@@ -0,0 +1,11 @@
import { module, test } from 'qunit';
import { setupTest } from 'ember-qunit';
module('Unit | Route | scopes/scope/projects/project/targets/target', function(hooks) {
setupTest(hooks);
test('it exists', function(assert) {
let route = this.owner.lookup('route:scopes/scope/projects/project/targets/target');
assert.ok(route);
});
});
@@ -0,0 +1,11 @@
import { module, test } from 'qunit';
import { setupTest } from 'ember-qunit';
module('Unit | Route | scopes/scope/projects/project/targets/target/index', function(hooks) {
setupTest(hooks);
test('it exists', function(assert) {
let route = this.owner.lookup('route:scopes/scope/projects/project/targets/target/index');
assert.ok(route);
});
});
+10
View File
@@ -17,6 +17,7 @@ actions:
delete-auth-method: Delete auth method
delete-host-set: Delete host set
delete-host: Delete host
delete-target: Delete target
add-host-set: Create Host Set
add-host: Create Host
auth:
@@ -33,6 +34,9 @@ auth:
host-set:
types:
static: Static
target:
protocols:
SSH: SSH
host:
types:
static: Static
@@ -55,6 +59,8 @@ resources:
host-sets: Host Sets
hosts: Hosts
host: Host
target: Target
targets: Targets
titles:
iam: IAM
new: New
@@ -72,11 +78,13 @@ titles:
roles-welcome: Welcome to Roles
groups-welcome: Welcome to Groups
auth-methods-welcome: Welcome to Auth Methods
targets-welcome: Create your first Target
grants: Permissions
new-grant: New Grant
principals: Principals
host-sets: Host Sets
hosts: Hosts
targets: Targets
global: Global
descriptions:
host-catalogs: Overview of collections of hosts and host sets.
@@ -89,6 +97,7 @@ descriptions:
roles-welcome: Roles are collections of capabilities that can be granted to user and/or groups.
groups-welcome: Groups are collections of users.
auth-methods-welcome: Auth methods are configurations to authenticate users.
targets-welcome: Targets provide Users the means to connect to and interact networked services. A Target contains a collection of Hosts and a collection of Credentials.
states:
info: Info
success: Success
@@ -105,6 +114,7 @@ form:
manage: Manage
grant: Grant
principal: Principal
protocol: Protocol
errors:
titles:
unauthenticated-error: You are not signed in