From 3ef1ee2d11e84c402222750e69f932cb3a942789 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Tue, 6 Oct 2020 17:24:30 -0400 Subject: [PATCH 1/7] =?UTF-8?q?chore:=20=F0=9F=A4=96=20add=20additional=20?= =?UTF-8?q?documentation=20links=20throughout?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/core/app/helpers/doc-url.js | 3 +-- .../scopes/scope/auth-methods/auth-method/-header.hbs | 2 +- .../auth-method/accounts/account/-header.hbs | 2 +- .../auth-methods/auth-method/accounts/new/-header.hbs | 5 ++++- .../app/templates/scopes/scope/auth-methods/index.hbs | 2 +- .../templates/scopes/scope/groups/group/-header.hbs | 2 +- .../scopes/scope/groups/group/add-members/-header.hbs | 5 ++++- ui/core/app/templates/scopes/scope/groups/index.hbs | 2 +- ui/core/app/templates/scopes/scope/orgs/index.hbs | 2 +- ui/core/app/templates/scopes/scope/orgs/new.hbs | 5 ++++- ui/core/app/templates/scopes/scope/projects/index.hbs | 2 +- ui/core/app/templates/scopes/scope/projects/new.hbs | 5 ++++- .../project/host-catalogs/host-catalog/-header.hbs | 2 +- .../host-catalog/host-sets/host-set/-header.hbs | 2 +- .../host-sets/host-set/add-hosts/-header.hbs | 7 +++++-- .../host-catalog/host-sets/new/-header.hbs | 5 ++++- .../host-catalogs/host-catalog/hosts/host/-header.hbs | 2 +- .../host-catalogs/host-catalog/hosts/new/-header.hbs | 5 ++++- .../scope/projects/project/host-catalogs/index.hbs | 2 +- .../scope/projects/project/host-catalogs/new.hbs | 5 ++++- .../templates/scopes/scope/projects/project/index.hbs | 2 +- .../scopes/scope/projects/project/sessions/index.hbs | 2 +- .../scopes/scope/projects/project/targets/index.hbs | 2 +- .../scopes/scope/projects/project/targets/new.hbs | 5 ++++- .../scope/projects/project/targets/target/-header.hbs | 2 +- .../project/targets/target/add-host-sets/-header.hbs | 7 +++++-- ui/core/app/templates/scopes/scope/roles/index.hbs | 2 +- .../app/templates/scopes/scope/roles/role/-header.hbs | 2 +- .../scope/roles/role/add-principals/-header.hbs | 7 +++++-- .../scopes/scope/roles/role/grants/-header.hbs | 2 +- .../scopes/scope/roles/role/principals/-header.hbs | 2 +- ui/core/app/templates/scopes/scope/users/index.hbs | 2 +- .../app/templates/scopes/scope/users/user/-header.hbs | 2 +- ui/core/config/environment.js | 11 +++++++++++ ui/core/tests/integration/components/doc-link-test.js | 2 +- ui/core/tests/integration/helpers/doc-url-test.js | 4 ++-- ui/core/translations/resources/en-us.yaml | 4 ++-- 37 files changed, 85 insertions(+), 42 deletions(-) diff --git a/ui/core/app/helpers/doc-url.js b/ui/core/app/helpers/doc-url.js index e31e4932a..bff751918 100644 --- a/ui/core/app/helpers/doc-url.js +++ b/ui/core/app/helpers/doc-url.js @@ -1,12 +1,11 @@ import { helper } from '@ember/component/helper'; -import { get } from '@ember/object'; import { assert } from '@ember/debug'; import config from '../config/environment'; export default helper(function docUrl(params/*, hash*/) { const baseURL = config.documentation.baseURL; const docKey = params[0] || ''; - const configuredPath = get(config.documentation, docKey); + const configuredPath = config.documentation.topics[docKey]; if (docKey) { assert(` Documentation for "${docKey}" could not be found. Please ensure that diff --git a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/-header.hbs b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/-header.hbs index 98ab86788..080012f3b 100644 --- a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/-header.hbs +++ b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/-header.hbs @@ -1,6 +1,6 @@

{{t "resources.auth-method.title"}} - +

{{t "resources.auth-method.description"}}

{{t "resources.account.title"}} - + {{t "titles.new"}} \ No newline at end of file +

+ {{t "titles.new"}} + +

diff --git a/ui/core/app/templates/scopes/scope/auth-methods/index.hbs b/ui/core/app/templates/scopes/scope/auth-methods/index.hbs index 5d3f270d2..a796c66f5 100644 --- a/ui/core/app/templates/scopes/scope/auth-methods/index.hbs +++ b/ui/core/app/templates/scopes/scope/auth-methods/index.hbs @@ -2,7 +2,7 @@

{{t "resources.auth-method.title_plural"}} - +

{{t "resources.auth-method.description"}}

 diff --git a/ui/core/app/templates/scopes/scope/groups/group/-header.hbs b/ui/core/app/templates/scopes/scope/groups/group/-header.hbs index ad843f83a..6dab6766a 100644 --- a/ui/core/app/templates/scopes/scope/groups/group/-header.hbs +++ b/ui/core/app/templates/scopes/scope/groups/group/-header.hbs @@ -1,6 +1,6 @@

{{t "resources.group.title"}} - +

{{t "resources.group.description"}}

{{t "resources.group.messages.add-members.title"}} +

+ {{t "resources.group.messages.add-members.title"}} + +

{{t "resources.group.messages.add-members.description"}}

diff --git a/ui/core/app/templates/scopes/scope/groups/index.hbs b/ui/core/app/templates/scopes/scope/groups/index.hbs index 197782427..7dbf66358 100644 --- a/ui/core/app/templates/scopes/scope/groups/index.hbs +++ b/ui/core/app/templates/scopes/scope/groups/index.hbs @@ -7,7 +7,7 @@

{{t "resources.group.title_plural"}} - +

{{t "resources.group.description"}}

 diff --git a/ui/core/app/templates/scopes/scope/orgs/index.hbs b/ui/core/app/templates/scopes/scope/orgs/index.hbs index efe5f0a59..e0dcfd1ac 100644 --- a/ui/core/app/templates/scopes/scope/orgs/index.hbs +++ b/ui/core/app/templates/scopes/scope/orgs/index.hbs @@ -7,7 +7,7 @@

{{t "resources.org.title_plural"}} - +

{{#if @model}}

{{t "resources.org.description"}}

diff --git a/ui/core/app/templates/scopes/scope/orgs/new.hbs b/ui/core/app/templates/scopes/scope/orgs/new.hbs index d9fe8b361..390f0f04b 100644 --- a/ui/core/app/templates/scopes/scope/orgs/new.hbs +++ b/ui/core/app/templates/scopes/scope/orgs/new.hbs @@ -7,7 +7,10 @@ -

{{t "titles.new"}}

+

+ {{t "titles.new"}} + +

diff --git a/ui/core/app/templates/scopes/scope/projects/index.hbs b/ui/core/app/templates/scopes/scope/projects/index.hbs index fca7f0fae..725d3973f 100644 --- a/ui/core/app/templates/scopes/scope/projects/index.hbs +++ b/ui/core/app/templates/scopes/scope/projects/index.hbs @@ -7,7 +7,7 @@

{{t "resources.project.title_plural"}} - +

{{#if @model}}

{{t "resources.project.description"}}

diff --git a/ui/core/app/templates/scopes/scope/projects/new.hbs b/ui/core/app/templates/scopes/scope/projects/new.hbs index a8758e3c0..0e9dedf59 100644 --- a/ui/core/app/templates/scopes/scope/projects/new.hbs +++ b/ui/core/app/templates/scopes/scope/projects/new.hbs @@ -7,7 +7,10 @@ -

{{t "titles.new"}}

+

+ {{t "titles.new"}} + +

diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/-header.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/-header.hbs index f4d885fae..58e6f4b02 100644 --- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/-header.hbs +++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/-header.hbs @@ -1,6 +1,6 @@

{{t "resources.host-catalog.title"}} - +

{{t "resources.host-catalog.description"}}

{{t "resources.host-set.title"}} - +

{{t "resources.host-set.description"}}

{{t "resources.host-set.host.messages.add.title"}} -

{{t "resources.host-set.host.messages.add.description"}}

\ No newline at end of file +

+ {{t "resources.host-set.host.messages.add.title"}} + +

+

{{t "resources.host-set.host.messages.add.description"}}

diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/new/-header.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/new/-header.hbs index ace8ccb08..38ae01334 100644 --- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/new/-header.hbs +++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/new/-header.hbs @@ -1 +1,4 @@ -

{{t "titles.new"}}

\ No newline at end of file +

+ {{t "titles.new"}} + +

diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/host/-header.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/host/-header.hbs index 3c28edc80..7b15e6f0f 100644 --- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/host/-header.hbs +++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/host/-header.hbs @@ -1,6 +1,6 @@

{{t "resources.host.title"}} - +

{{t "resources.host.description"}}

{{t "titles.new"}} \ No newline at end of file +

+ {{t "titles.new"}} + +

diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/index.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/index.hbs index 120ae0e48..91a17f32d 100644 --- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/index.hbs +++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/index.hbs @@ -7,7 +7,7 @@

{{t "resources.host-catalog.title_plural"}} - +

{{t "resources.host-catalog.description"}}

 diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/new.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/new.hbs index 0d969f874..641fd3ff9 100644 --- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/new.hbs +++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/new.hbs @@ -7,7 +7,10 @@ -

{{t "titles.new"}}

+

+ {{t "titles.new"}} + +

diff --git a/ui/core/app/templates/scopes/scope/projects/project/index.hbs b/ui/core/app/templates/scopes/scope/projects/project/index.hbs index 4cb31e30a..02f7a667b 100644 --- a/ui/core/app/templates/scopes/scope/projects/project/index.hbs +++ b/ui/core/app/templates/scopes/scope/projects/project/index.hbs @@ -7,7 +7,7 @@

{{t "resources.project.title"}} - +

{{t "resources.project.description"}}

{{t "resources.session.title_plural"}} - +

{{t "resources.session.description"}}

 diff --git a/ui/core/app/templates/scopes/scope/projects/project/targets/index.hbs b/ui/core/app/templates/scopes/scope/projects/project/targets/index.hbs index 9615a7c2d..6efba5727 100644 --- a/ui/core/app/templates/scopes/scope/projects/project/targets/index.hbs +++ b/ui/core/app/templates/scopes/scope/projects/project/targets/index.hbs @@ -7,7 +7,7 @@

{{t "resources.target.title_plural"}} - +

{{#if @model}}

{{t "resources.target.description"}}

diff --git a/ui/core/app/templates/scopes/scope/projects/project/targets/new.hbs b/ui/core/app/templates/scopes/scope/projects/project/targets/new.hbs index 4ac91435b..f161f252b 100644 --- a/ui/core/app/templates/scopes/scope/projects/project/targets/new.hbs +++ b/ui/core/app/templates/scopes/scope/projects/project/targets/new.hbs @@ -7,7 +7,10 @@ -

{{t "titles.new"}}

+

+ {{t "titles.new"}} + +

diff --git a/ui/core/app/templates/scopes/scope/projects/project/targets/target/-header.hbs b/ui/core/app/templates/scopes/scope/projects/project/targets/target/-header.hbs index b94a925a8..14e01c1de 100644 --- a/ui/core/app/templates/scopes/scope/projects/project/targets/target/-header.hbs +++ b/ui/core/app/templates/scopes/scope/projects/project/targets/target/-header.hbs @@ -1,6 +1,6 @@

{{t "resources.target.title"}} - +

{{t "resources.target.description"}}

{{t "resources.target.host-set.messages.add.title"}} -

{{t "resources.target.host-set.messages.add.description"}}

\ No newline at end of file +

+ {{t "resources.target.host-set.messages.add.title"}} + +

+

{{t "resources.target.host-set.messages.add.description"}}

diff --git a/ui/core/app/templates/scopes/scope/roles/index.hbs b/ui/core/app/templates/scopes/scope/roles/index.hbs index 2175ad1a9..8acc8ee3a 100644 --- a/ui/core/app/templates/scopes/scope/roles/index.hbs +++ b/ui/core/app/templates/scopes/scope/roles/index.hbs @@ -7,7 +7,7 @@

{{t "resources.role.title_plural"}} - +

{{#if @model}}

{{t "resources.role.description"}}

diff --git a/ui/core/app/templates/scopes/scope/roles/role/-header.hbs b/ui/core/app/templates/scopes/scope/roles/role/-header.hbs index a04e5edc1..142af2e8d 100644 --- a/ui/core/app/templates/scopes/scope/roles/role/-header.hbs +++ b/ui/core/app/templates/scopes/scope/roles/role/-header.hbs @@ -1,6 +1,6 @@

{{t "resources.role.title"}} - +

{{t "resources.role.description"}}

{{t "resources.role.principal.messages.add-principals.title"}} -

{{t "resources.role.principal.messages.add-principals.description"}}

\ No newline at end of file +

+ {{t "resources.role.principal.messages.add-principals.title"}} + +

+

{{t "resources.role.principal.messages.add-principals.description"}}

diff --git a/ui/core/app/templates/scopes/scope/roles/role/grants/-header.hbs b/ui/core/app/templates/scopes/scope/roles/role/grants/-header.hbs index 84395fb77..4aea69c7e 100644 --- a/ui/core/app/templates/scopes/scope/roles/role/grants/-header.hbs +++ b/ui/core/app/templates/scopes/scope/roles/role/grants/-header.hbs @@ -1,6 +1,6 @@

{{t "resources.role.title"}} - +

{{t "resources.role.grant.description"}}

{{t "resources.role.title"}} - +

{{t "resources.role.principal.description"}}

{{t "resources.user.title_plural"}} - +

{{#if @model}}

{{t "resources.user.description"}}

diff --git a/ui/core/app/templates/scopes/scope/users/user/-header.hbs b/ui/core/app/templates/scopes/scope/users/user/-header.hbs index 1f80dcfc5..d6208892e 100644 --- a/ui/core/app/templates/scopes/scope/users/user/-header.hbs +++ b/ui/core/app/templates/scopes/scope/users/user/-header.hbs @@ -1,6 +1,6 @@

{{t "resources.user.title"}} - +

{{t "resources.user.description"}}

`); + await render(hbs``); assert.ok(find('.doc-link .rose-icon.large')); }); }); diff --git a/ui/core/tests/integration/helpers/doc-url-test.js b/ui/core/tests/integration/helpers/doc-url-test.js index d91c9eeed..d4263c1eb 100644 --- a/ui/core/tests/integration/helpers/doc-url-test.js +++ b/ui/core/tests/integration/helpers/doc-url-test.js @@ -11,7 +11,7 @@ module('Integration | Helper | doc-url', function(hooks) { assert.expect(3); const baseURL = config.documentation.baseURL; const path = config.documentation.topics.account; - await render(hbs`{{doc-url 'topics.account'}}`); + await render(hbs`{{doc-url 'account'}}`); assert.ok(baseURL); assert.ok(path); assert.equal(this.element.textContent.trim(), `${baseURL}${path}`); @@ -20,7 +20,7 @@ module('Integration | Helper | doc-url', function(hooks) { test('it throws an error if the specified documentation path cannot be found', async function(assert) { assert.expect(2); const helper = this.owner.lookup('helper:doc-url'); - assert.ok(helper.compute(['topics.account']), 'Specified document exists.') + assert.ok(helper.compute(['account']), 'Specified document exists.') assert.throws(() => { helper.compute(['no.such.doc']); }, 'Specified documentation was not found, so the helper threw an error.'); diff --git a/ui/core/translations/resources/en-us.yaml b/ui/core/translations/resources/en-us.yaml index fccc4b485..bdb87f84a 100644 --- a/ui/core/translations/resources/en-us.yaml +++ b/ui/core/translations/resources/en-us.yaml @@ -107,14 +107,14 @@ session: org: title: Organization title_plural: Organizations - description: An organization is a type of scope used to organize projects and IAM resources. Organizations contain projects and is a child scope of global. + description: An organization is a type of scope used to organize projects and IAM resources. Organizations are child scopes of the global scope. messages: welcome: title: Welcome to Organizations project: title: Project title_plural: Projects - description: A project is a type of scope used to organize resources such as by targets and host catalogs. + description: A project is a type of scope used to organize resources such as targets and host catalogs. messages: welcome: title: Welcome to Projects From eb2604d2d54980fdcd8e54d1f5b2ed28686a06d8 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Tue, 6 Oct 2020 17:55:19 -0400 Subject: [PATCH 2/7] =?UTF-8?q?chore:=20=F0=9F=A4=96=20updated=20doc=20pat?= =?UTF-8?q?hs=20to=20be=20plural?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/core/config/environment.js | 46 +++++++++++++++++------------------ 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/ui/core/config/environment.js b/ui/core/config/environment.js index ce67eb35d..35a77d0f3 100644 --- a/ui/core/config/environment.js +++ b/ui/core/config/environment.js @@ -41,29 +41,29 @@ module.exports = function (environment) { documentation: { baseURL: 'https://boundaryproject.io/help/admin-ui', topics: { - org: '/org', - 'org.new': '/org/new', - project: '/project', - 'project.new': '/project/new', - account: '/account', - 'account.new': '/account/new', - 'auth-method': '/auth-method', - group: '/group', - 'group.add-members': '/group/add-members', - 'host-catalog': '/host-catalog', - 'host-catalog.new': '/host-catalog/new', - 'host-set': '/host-set', - 'host-set.new': '/host-set/new', - 'host-set.add-hosts': '/host-set/add-hosts', - host: '/host', - 'host.new': '/host/new', - role: '/role', - 'role.add-principals': '/role/add-principals', - session: '/session', - target: '/target', - 'target.new': '/target/new', - 'target.add-host-sets': '/target/add-host-sets', - user: '/user' + org: '/orgs', + 'org.new': '/orgs/new', + project: '/projects', + 'project.new': '/projects/new', + account: '/accounts', + 'account.new': '/accounts/new', + 'auth-method': '/auth-methods', + group: '/groups', + 'group.add-members': '/groups/add-members', + 'host-catalog': '/host-catalogs', + 'host-catalog.new': '/host-catalogs/new', + 'host-set': '/host-sets', + 'host-set.new': '/host-sets/new', + 'host-set.add-hosts': '/host-sets/add-hosts', + host: '/hosts', + 'host.new': '/hosts/new', + role: '/roles', + 'role.add-principals': '/roles/add-principals', + session: '/sessions', + target: '/targets', + 'target.new': '/targets/new', + 'target.add-host-sets': '/targets/add-host-sets', + user: '/users' } }, From cea8acf88669e1204bb780a27a893e23b7469ad2 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Wed, 7 Oct 2020 09:28:34 -0400 Subject: [PATCH 3/7] =?UTF-8?q?chore:=20=F0=9F=A4=96=20add=20favicon=20and?= =?UTF-8?q?=20genericize=20SVG=20references?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/core/app/index.html | 2 ++ ui/core/app/templates/application.hbs | 8 ++++---- ui/core/app/templates/scopes/scope.hbs | 2 +- ui/core/app/templates/scopes/scope/-sidebar.hbs | 8 ++++---- ui/core/app/templates/scopes/scope/orgs/index.hbs | 2 +- ui/core/app/templates/scopes/scope/projects/index.hbs | 2 +- .../templates/scopes/scope/projects/project/-sidebar.hbs | 6 +++--- .../{boundary-icons => app-icons}/action-session.svg | 0 .../public/{boundary-icons => app-icons}/auth-method.svg | 0 ui/core/public/{boundary-icons => app-icons}/gear.svg | 0 ui/core/public/{boundary-icons => app-icons}/group.svg | 0 .../{boundary-icons => app-icons}/host-catalogs.svg | 0 ui/core/public/{boundary-icons => app-icons}/org.svg | 0 ui/core/public/{boundary-icons => app-icons}/project.svg | 0 ui/core/public/{boundary-icons => app-icons}/roles.svg | 0 ui/core/public/{boundary-icons => app-icons}/target.svg | 0 .../public/{boundary-icons => app-icons}/user-profile.svg | 0 ui/core/public/{boundary-icons => app-icons}/users.svg | 0 ui/core/public/{logo-boundary.svg => logo-app.svg} | 0 ui/core/public/{logo-hashi.svg => logo-company.svg} | 0 ui/core/public/logo.svg | 1 - 21 files changed, 16 insertions(+), 15 deletions(-) rename ui/core/public/{boundary-icons => app-icons}/action-session.svg (100%) rename ui/core/public/{boundary-icons => app-icons}/auth-method.svg (100%) rename ui/core/public/{boundary-icons => app-icons}/gear.svg (100%) rename ui/core/public/{boundary-icons => app-icons}/group.svg (100%) rename ui/core/public/{boundary-icons => app-icons}/host-catalogs.svg (100%) rename ui/core/public/{boundary-icons => app-icons}/org.svg (100%) rename ui/core/public/{boundary-icons => app-icons}/project.svg (100%) rename ui/core/public/{boundary-icons => app-icons}/roles.svg (100%) rename ui/core/public/{boundary-icons => app-icons}/target.svg (100%) rename ui/core/public/{boundary-icons => app-icons}/user-profile.svg (100%) rename ui/core/public/{boundary-icons => app-icons}/users.svg (100%) rename ui/core/public/{logo-boundary.svg => logo-app.svg} (100%) rename ui/core/public/{logo-hashi.svg => logo-company.svg} (100%) delete mode 100644 ui/core/public/logo.svg diff --git a/ui/core/app/index.html b/ui/core/app/index.html index 21cb16f81..248478b1f 100644 --- a/ui/core/app/index.html +++ b/ui/core/app/index.html @@ -12,6 +12,8 @@ + + {{content-for "head-footer"}} diff --git a/ui/core/app/templates/application.hbs b/ui/core/app/templates/application.hbs index ac4f0eac3..6db0e5baa 100644 --- a/ui/core/app/templates/application.hbs +++ b/ui/core/app/templates/application.hbs @@ -5,13 +5,13 @@ - + {{#if this.session.isAuthenticated}} {{#if this.session.data.authenticated.isGlobal}} @@ -35,7 +35,7 @@ {{t 'actions.change-password'}} @@ -59,7 +59,7 @@ - + {{company-copyright}} {{app-name}} diff --git a/ui/core/app/templates/scopes/scope.hbs b/ui/core/app/templates/scopes/scope.hbs index 2d7d21026..908b13f16 100644 --- a/ui/core/app/templates/scopes/scope.hbs +++ b/ui/core/app/templates/scopes/scope.hbs @@ -6,7 +6,7 @@ {{t "resources.project.title_plural"}} diff --git a/ui/core/app/templates/scopes/scope/-sidebar.hbs b/ui/core/app/templates/scopes/scope/-sidebar.hbs index 27852d3ec..45780e932 100644 --- a/ui/core/app/templates/scopes/scope/-sidebar.hbs +++ b/ui/core/app/templates/scopes/scope/-sidebar.hbs @@ -1,25 +1,25 @@ {{t "resources.user.title_plural"}} {{t "resources.group.title_plural"}} {{t "resources.role.title_plural"}} {{t "resources.auth-method.title_plural"}} diff --git a/ui/core/app/templates/scopes/scope/orgs/index.hbs b/ui/core/app/templates/scopes/scope/orgs/index.hbs index efe5f0a59..b888817fb 100644 --- a/ui/core/app/templates/scopes/scope/orgs/index.hbs +++ b/ui/core/app/templates/scopes/scope/orgs/index.hbs @@ -35,7 +35,7 @@ @title={{org.name}} @description={{org.description}} @id={{org.id}} - @icon="boundary-icons/org" + @icon="app-icons/org" @route="scopes.scope" @model={{org.id}} /> diff --git a/ui/core/app/templates/scopes/scope/projects/index.hbs b/ui/core/app/templates/scopes/scope/projects/index.hbs index fca7f0fae..ebf9e2e21 100644 --- a/ui/core/app/templates/scopes/scope/projects/index.hbs +++ b/ui/core/app/templates/scopes/scope/projects/index.hbs @@ -35,7 +35,7 @@ @title={{project.name}} @description={{project.description}} @id={{project.id}} - @icon="boundary-icons/project" + @icon="app-icons/project" @route="scopes.scope.projects.project" @model={{project.id}} /> diff --git a/ui/core/app/templates/scopes/scope/projects/project/-sidebar.hbs b/ui/core/app/templates/scopes/scope/projects/project/-sidebar.hbs index 5f7845697..e82349443 100644 --- a/ui/core/app/templates/scopes/scope/projects/project/-sidebar.hbs +++ b/ui/core/app/templates/scopes/scope/projects/project/-sidebar.hbs @@ -1,19 +1,19 @@ {{t "resources.session.title_plural"}} {{t "resources.target.title_plural"}} {{t "resources.host-catalog.title_plural"}} diff --git a/ui/core/public/boundary-icons/action-session.svg b/ui/core/public/app-icons/action-session.svg similarity index 100% rename from ui/core/public/boundary-icons/action-session.svg rename to ui/core/public/app-icons/action-session.svg diff --git a/ui/core/public/boundary-icons/auth-method.svg b/ui/core/public/app-icons/auth-method.svg similarity index 100% rename from ui/core/public/boundary-icons/auth-method.svg rename to ui/core/public/app-icons/auth-method.svg diff --git a/ui/core/public/boundary-icons/gear.svg b/ui/core/public/app-icons/gear.svg similarity index 100% rename from ui/core/public/boundary-icons/gear.svg rename to ui/core/public/app-icons/gear.svg diff --git a/ui/core/public/boundary-icons/group.svg b/ui/core/public/app-icons/group.svg similarity index 100% rename from ui/core/public/boundary-icons/group.svg rename to ui/core/public/app-icons/group.svg diff --git a/ui/core/public/boundary-icons/host-catalogs.svg b/ui/core/public/app-icons/host-catalogs.svg similarity index 100% rename from ui/core/public/boundary-icons/host-catalogs.svg rename to ui/core/public/app-icons/host-catalogs.svg diff --git a/ui/core/public/boundary-icons/org.svg b/ui/core/public/app-icons/org.svg similarity index 100% rename from ui/core/public/boundary-icons/org.svg rename to ui/core/public/app-icons/org.svg diff --git a/ui/core/public/boundary-icons/project.svg b/ui/core/public/app-icons/project.svg similarity index 100% rename from ui/core/public/boundary-icons/project.svg rename to ui/core/public/app-icons/project.svg diff --git a/ui/core/public/boundary-icons/roles.svg b/ui/core/public/app-icons/roles.svg similarity index 100% rename from ui/core/public/boundary-icons/roles.svg rename to ui/core/public/app-icons/roles.svg diff --git a/ui/core/public/boundary-icons/target.svg b/ui/core/public/app-icons/target.svg similarity index 100% rename from ui/core/public/boundary-icons/target.svg rename to ui/core/public/app-icons/target.svg diff --git a/ui/core/public/boundary-icons/user-profile.svg b/ui/core/public/app-icons/user-profile.svg similarity index 100% rename from ui/core/public/boundary-icons/user-profile.svg rename to ui/core/public/app-icons/user-profile.svg diff --git a/ui/core/public/boundary-icons/users.svg b/ui/core/public/app-icons/users.svg similarity index 100% rename from ui/core/public/boundary-icons/users.svg rename to ui/core/public/app-icons/users.svg diff --git a/ui/core/public/logo-boundary.svg b/ui/core/public/logo-app.svg similarity index 100% rename from ui/core/public/logo-boundary.svg rename to ui/core/public/logo-app.svg diff --git a/ui/core/public/logo-hashi.svg b/ui/core/public/logo-company.svg similarity index 100% rename from ui/core/public/logo-hashi.svg rename to ui/core/public/logo-company.svg diff --git a/ui/core/public/logo.svg b/ui/core/public/logo.svg deleted file mode 100644 index 2a28cc024..000000000 --- a/ui/core/public/logo.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file From a5811f0ea7bc4ce0541d8fd9aad2c222465f31a4 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Wed, 7 Oct 2020 10:08:07 -0400 Subject: [PATCH 4/7] =?UTF-8?q?fix:=20=F0=9F=90=9B=20ensure=20password=20r?= =?UTF-8?q?eset=20is=20always=20called?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit on occassion it could break if axe is running, which is probably only an issue when developing the UI, but to be safe... --- .../form/account/password/change-password/index.hbs | 2 +- .../form/account/password/change-password/index.js | 13 +++++++------ .../form/account/password/set-password/index.hbs | 2 +- .../form/account/password/set-password/index.js | 10 +++++----- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/ui/core/app/components/form/account/password/change-password/index.hbs b/ui/core/app/components/form/account/password/change-password/index.hbs index 24548e843..954da26c1 100644 --- a/ui/core/app/components/form/account/password/change-password/index.hbs +++ b/ui/core/app/components/form/account/password/change-password/index.hbs @@ -1,6 +1,6 @@ this.resetPasswords()); - fn(currentPassword, newPassword); + submit(fn, currentPassword, newPassword) { + console.log(currentPassword, newPassword); + run(() => this.resetPasswords()); + run(() => fn(currentPassword, newPassword)); } /** diff --git a/ui/core/app/components/form/account/password/set-password/index.hbs b/ui/core/app/components/form/account/password/set-password/index.hbs index b77d6b659..9008a9094 100644 --- a/ui/core/app/components/form/account/password/set-password/index.hbs +++ b/ui/core/app/components/form/account/password/set-password/index.hbs @@ -1,5 +1,5 @@ this.resetPassword()); - fn(password); + submit(fn, password) { + run(() => this.resetPassword()); + run(() => fn(password)); } } From 139bf7a437e08e0a4ef91ac664de32122c2acf69 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Wed, 7 Oct 2020 10:16:40 -0400 Subject: [PATCH 5/7] =?UTF-8?q?chore:=20=F0=9F=A4=96=20remove=20console.lo?= =?UTF-8?q?g=20statement?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/form/account/password/change-password/index.js | 1 - 1 file changed, 1 deletion(-) diff --git a/ui/core/app/components/form/account/password/change-password/index.js b/ui/core/app/components/form/account/password/change-password/index.js index ba61219ab..e2dcd0bac 100644 --- a/ui/core/app/components/form/account/password/change-password/index.js +++ b/ui/core/app/components/form/account/password/change-password/index.js @@ -55,7 +55,6 @@ export default class FormAccountPasswordChangePasswordIndexComponent extends Com */ @action submit(fn, currentPassword, newPassword) { - console.log(currentPassword, newPassword); run(() => this.resetPasswords()); run(() => fn(currentPassword, newPassword)); } From 4650b5e571806c9d6ab3ecbeff649ab20417c2e9 Mon Sep 17 00:00:00 2001 From: Susmitha Girumala Date: Wed, 7 Oct 2020 10:40:03 -0400 Subject: [PATCH 6/7] fix: Remove unused .gitkeep files --- addons/api/addon/.gitkeep | 0 addons/api/app/.gitkeep | 0 addons/api/tests/dummy/app/components/.gitkeep | 0 addons/api/tests/dummy/app/controllers/.gitkeep | 0 addons/api/tests/dummy/app/helpers/.gitkeep | 0 addons/api/tests/dummy/app/models/.gitkeep | 0 addons/api/tests/dummy/app/routes/.gitkeep | 0 addons/api/tests/helpers/.gitkeep | 0 addons/api/tests/integration/.gitkeep | 0 addons/api/vendor/.gitkeep | 0 addons/auth/app/.gitkeep | 0 addons/auth/tests/dummy/app/components/.gitkeep | 0 addons/auth/tests/dummy/app/controllers/.gitkeep | 0 addons/auth/tests/dummy/app/helpers/.gitkeep | 0 addons/auth/tests/dummy/app/models/.gitkeep | 0 addons/auth/tests/dummy/app/routes/.gitkeep | 0 addons/auth/tests/helpers/.gitkeep | 0 addons/auth/tests/integration/.gitkeep | 0 addons/auth/tests/unit/.gitkeep | 0 addons/rose/addon/.gitkeep | 0 addons/rose/app/.gitkeep | 0 addons/rose/tests/dummy/app/components/.gitkeep | 0 addons/rose/tests/dummy/app/helpers/.gitkeep | 0 addons/rose/tests/dummy/app/models/.gitkeep | 0 addons/rose/tests/dummy/app/routes/.gitkeep | 0 addons/rose/tests/helpers/.gitkeep | 0 addons/rose/tests/integration/.gitkeep | 0 addons/rose/vendor/.gitkeep | 0 ui/core/app/models/.gitkeep | 0 ui/core/tests/integration/.gitkeep | 0 ui/core/tests/unit/.gitkeep | 0 ui/core/vendor/.gitkeep | 0 32 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 addons/api/addon/.gitkeep delete mode 100644 addons/api/app/.gitkeep delete mode 100644 addons/api/tests/dummy/app/components/.gitkeep delete mode 100644 addons/api/tests/dummy/app/controllers/.gitkeep delete mode 100644 addons/api/tests/dummy/app/helpers/.gitkeep delete mode 100644 addons/api/tests/dummy/app/models/.gitkeep delete mode 100644 addons/api/tests/dummy/app/routes/.gitkeep delete mode 100644 addons/api/tests/helpers/.gitkeep delete mode 100644 addons/api/tests/integration/.gitkeep delete mode 100644 addons/api/vendor/.gitkeep delete mode 100644 addons/auth/app/.gitkeep delete mode 100644 addons/auth/tests/dummy/app/components/.gitkeep delete mode 100644 addons/auth/tests/dummy/app/controllers/.gitkeep delete mode 100644 addons/auth/tests/dummy/app/helpers/.gitkeep delete mode 100644 addons/auth/tests/dummy/app/models/.gitkeep delete mode 100644 addons/auth/tests/dummy/app/routes/.gitkeep delete mode 100644 addons/auth/tests/helpers/.gitkeep delete mode 100644 addons/auth/tests/integration/.gitkeep delete mode 100644 addons/auth/tests/unit/.gitkeep delete mode 100644 addons/rose/addon/.gitkeep delete mode 100644 addons/rose/app/.gitkeep delete mode 100644 addons/rose/tests/dummy/app/components/.gitkeep delete mode 100644 addons/rose/tests/dummy/app/helpers/.gitkeep delete mode 100644 addons/rose/tests/dummy/app/models/.gitkeep delete mode 100644 addons/rose/tests/dummy/app/routes/.gitkeep delete mode 100644 addons/rose/tests/helpers/.gitkeep delete mode 100644 addons/rose/tests/integration/.gitkeep delete mode 100644 addons/rose/vendor/.gitkeep delete mode 100644 ui/core/app/models/.gitkeep delete mode 100644 ui/core/tests/integration/.gitkeep delete mode 100644 ui/core/tests/unit/.gitkeep delete mode 100644 ui/core/vendor/.gitkeep diff --git a/addons/api/addon/.gitkeep b/addons/api/addon/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/addons/api/app/.gitkeep b/addons/api/app/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/addons/api/tests/dummy/app/components/.gitkeep b/addons/api/tests/dummy/app/components/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/addons/api/tests/dummy/app/controllers/.gitkeep b/addons/api/tests/dummy/app/controllers/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/addons/api/tests/dummy/app/helpers/.gitkeep b/addons/api/tests/dummy/app/helpers/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/addons/api/tests/dummy/app/models/.gitkeep b/addons/api/tests/dummy/app/models/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/addons/api/tests/dummy/app/routes/.gitkeep b/addons/api/tests/dummy/app/routes/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/addons/api/tests/helpers/.gitkeep b/addons/api/tests/helpers/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/addons/api/tests/integration/.gitkeep b/addons/api/tests/integration/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/addons/api/vendor/.gitkeep b/addons/api/vendor/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/addons/auth/app/.gitkeep b/addons/auth/app/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/addons/auth/tests/dummy/app/components/.gitkeep b/addons/auth/tests/dummy/app/components/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/addons/auth/tests/dummy/app/controllers/.gitkeep b/addons/auth/tests/dummy/app/controllers/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/addons/auth/tests/dummy/app/helpers/.gitkeep b/addons/auth/tests/dummy/app/helpers/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/addons/auth/tests/dummy/app/models/.gitkeep b/addons/auth/tests/dummy/app/models/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/addons/auth/tests/dummy/app/routes/.gitkeep b/addons/auth/tests/dummy/app/routes/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/addons/auth/tests/helpers/.gitkeep b/addons/auth/tests/helpers/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/addons/auth/tests/integration/.gitkeep b/addons/auth/tests/integration/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/addons/auth/tests/unit/.gitkeep b/addons/auth/tests/unit/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/addons/rose/addon/.gitkeep b/addons/rose/addon/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/addons/rose/app/.gitkeep b/addons/rose/app/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/addons/rose/tests/dummy/app/components/.gitkeep b/addons/rose/tests/dummy/app/components/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/addons/rose/tests/dummy/app/helpers/.gitkeep b/addons/rose/tests/dummy/app/helpers/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/addons/rose/tests/dummy/app/models/.gitkeep b/addons/rose/tests/dummy/app/models/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/addons/rose/tests/dummy/app/routes/.gitkeep b/addons/rose/tests/dummy/app/routes/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/addons/rose/tests/helpers/.gitkeep b/addons/rose/tests/helpers/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/addons/rose/tests/integration/.gitkeep b/addons/rose/tests/integration/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/addons/rose/vendor/.gitkeep b/addons/rose/vendor/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/ui/core/app/models/.gitkeep b/ui/core/app/models/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/ui/core/tests/integration/.gitkeep b/ui/core/tests/integration/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/ui/core/tests/unit/.gitkeep b/ui/core/tests/unit/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/ui/core/vendor/.gitkeep b/ui/core/vendor/.gitkeep deleted file mode 100644 index e69de29bb..000000000 From ce08ae3001785292e2f09c2fe6244a0ea7888a1d Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Wed, 7 Oct 2020 10:53:53 -0400 Subject: [PATCH 7/7] =?UTF-8?q?chore:=20=F0=9F=A4=96=20empty=20strings=20s?= =?UTF-8?q?hould=20be=20serialized=20as=20null?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/api/addon/serializers/application.js | 5 ++++- .../tests/unit/serializers/application-test.js | 15 +++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/addons/api/addon/serializers/application.js b/addons/api/addon/serializers/application.js index 2819231fa..e4531c7fe 100644 --- a/addons/api/addon/serializers/application.js +++ b/addons/api/addon/serializers/application.js @@ -37,8 +37,11 @@ export default class ApplicationSerializer extends RESTSerializer { * @param {String} key * @param {Object} attribute */ - serializeAttribute(snapshot, json, key, { options }) { + serializeAttribute(snapshot, json, key, attribute) { + const { type, options } = attribute; let value = super.serializeAttribute(...arguments); + // Convert empty strings to null. + if (type === 'string' && json[key] === '') json[key] = null; // Do not serialize read-only attributes. if (options.readOnly) delete json[key]; // Version is sent only if it has a non-nullish value diff --git a/addons/api/tests/unit/serializers/application-test.js b/addons/api/tests/unit/serializers/application-test.js index 10de9d4fb..014d80377 100644 --- a/addons/api/tests/unit/serializers/application-test.js +++ b/addons/api/tests/unit/serializers/application-test.js @@ -70,6 +70,21 @@ module('Unit | Serializer | application', function (hooks) { }); }); + test('it serializes empty strings to null', function (assert) { + assert.expect(1); + const store = this.owner.lookup('service:store'); + const record = store.createRecord('user', { + name: '', + description: '', + version: null, + }); + let serializedRecord = record.serialize(); + assert.deepEqual(serializedRecord, { + name: null, + description: null, + }); + }); + test('it serializes non-nullish version fields', function (assert) { assert.expect(2); const store = this.owner.lookup('service:store');