chore: 🤖 merge main

This commit is contained in:
dharini committed 2021-09-01 14:42:31 -07:00
commit c36030c12d
94 files changed
+306 -272

No files matched your search

+2 -2
View File
@@ -12,8 +12,8 @@ export default class CopyableComponent extends Component {
id = generateComponentID();
copyableButtonId = `copyable-button-${this.id}`;
actionIcon = 'copy-action';
successIcon = 'copy-success';
actionIcon = 'flight-icons/clipboard-copy-16';
successIcon = 'flight-icons/clipboard-checked-16';
actionText = this.args.buttonText;
successText = this.args.acknowledgeText;
@@ -177,7 +177,7 @@
<row.cell @shrink={{true}}>
<Rose::Button
@style='warning'
@iconOnly='trash'
@iconOnly='flight-icons/trash-16'
title={{t 'actions.remove'}}
@disabled={{if
@model.isNew
@@ -278,7 +278,7 @@
<row.cell @shrink={{true}}>
<Rose::Button
@style='warning'
@iconOnly='trash'
@iconOnly='flight-icons/trash-16'
title={{t 'actions.remove'}}
@disabled={{if
@model.isNew
@@ -368,7 +368,7 @@
<row.cell @shrink={{true}}>
<Rose::Button
@style='warning'
@iconOnly='trash'
@iconOnly='flight-icons/trash-16'
title={{t 'actions.remove'}}
@disabled={{if
@model.isNew
@@ -477,7 +477,7 @@
<row.cell @shrink={{true}}>
<Rose::Button
@style='warning'
@iconOnly='trash'
@iconOnly='flight-icons/trash-16'
title={{t 'actions.remove'}}
@disabled={{if
@model.isNew
@@ -578,7 +578,7 @@
<row.cell @shrink={{true}}>
<Rose::Button
@style='warning'
@iconOnly='trash'
@iconOnly='flight-icons/trash-16'
title={{t 'actions.remove'}}
@disabled={{if
@model.isNew
@@ -49,7 +49,7 @@
{{t 'resources.group.messages.no-members.description'}}
</message.description>
<message.link @route='scopes.scope.groups.group.members'>
<Rose::Icon @name='chevron-left' />
<Rose::Icon @name='flight-icons/chevron-left-16' />
{{t 'actions.back'}}
</message.link>
</Rose::Message>
@@ -55,7 +55,7 @@
<message.link
@route='scopes.scope.host-catalogs.host-catalog.host-sets.host-set.hosts'
>
<Rose::Icon @name='chevron-left' />
<Rose::Icon @name='flight-icons/chevron-left-16' />
{{t 'actions.back'}}
</message.link>
</Rose::Message>
@@ -58,7 +58,7 @@
{{t 'resources.role.principal.messages.none.description'}}
</message.description>
<message.link @route='scopes.scope.roles.role.principals'>
<Rose::Icon @name='chevron-left' />
<Rose::Icon @name='flight-icons/chevron-left-16' />
{{t 'actions.back'}}
</message.link>
</Rose::Message>
@@ -74,7 +74,7 @@
<item.cell>
<Rose::Button
@style='secondary'
@iconOnly='trash'
@iconOnly='flight-icons/trash-16'
title={{t 'actions.remove'}}
{{on 'click' (fn @removeGrant grant.value)}}
>
+4 -2
View File
@@ -69,9 +69,11 @@
@text={{this.selectedGrantScope.displayName}}
@icon={{if
this.selectedGrantScope.isProject
'app-icons/project'
'flight-icons/grid-16'
(if
this.selectedGrantScope.isOrg 'app-icons/org' 'app-icons/global'
this.selectedGrantScope.isOrg
'flight-icons/org-16'
'flight-icons/globe-16'
)
}}
as |dropdown|
@@ -55,7 +55,7 @@
{{t 'resources.target.credential-library.messages.none.description'}}
</message.description>
<message.link @route='scopes.scope.targets.target.credential-libraries'>
<Rose::Icon @name='chevron-left' />
<Rose::Icon @name='flight-icons/chevron-left-16' />
{{t 'actions.back'}}
</message.link>
</Rose::Message>
@@ -59,7 +59,7 @@
{{t 'resources.target.host-set.messages.none.description'}}
</message.description>
<message.link @route='scopes.scope.targets.target.host-sets'>
<Rose::Icon @name='chevron-left' />
<Rose::Icon @name='flight-icons/chevron-left-16' />
{{t 'actions.back'}}
</message.link>
</Rose::Message>
@@ -59,7 +59,7 @@
{{t 'resources.user.messages.no-accounts.description'}}
</message.description>
<message.link @route='scopes.scope.users.user.accounts'>
<Rose::Icon @name='chevron-left' />
<Rose::Icon @name='flight-icons/chevron-left-16' />
{{t 'actions.back'}}
</message.link>
</Rose::Message>
-8
View File
@@ -189,14 +189,6 @@
}
}
.doc-link {
.large {
svg {
transform: scale(0.8);
}
}
}
[class*='session-status-'] {
color: var(--ui-gray-subtler-2);
}
+3 -3
View File
@@ -16,7 +16,7 @@
<header.utilities as |utilities|>
<utilities.dropdown
@text={{this.session.data.authenticated.username}}
@icon='app-icons/user-profile'
@icon='flight-icons/user-circle-16'
as |dropdown|
>
<dropdown.link @route='account.change-password'>
@@ -100,7 +100,7 @@
<Rose::Dialog
@heading={{t 'titles.abandon-confirm'}}
@dismissButtonText={{t 'actions.cancel'}}
@icon='alert-triangle'
@icon='flight-icons/alert-triangle-16'
@style='warning'
@modal={{true}}
@dismiss={{deny}}
@@ -126,7 +126,7 @@
(t 'actions.confirm')
}}
@dismissButtonText={{t 'actions.cancel'}}
@icon='alert-triangle'
@icon='flight-icons/alert-triangle-16'
@style='warning'
@modal={{true}}
@dismiss={{deny}}
+1 -1
View File
@@ -8,7 +8,7 @@
<Rose::Layout::Centered>
<Rose::Message
@title={{t 'auth.titles.no-scopes'}}
@icon='alert-circle-outline'
@icon='flight-icons/alert-circle-16'
as |message|
>
<message.description>
+18 -15
View File
@@ -18,7 +18,7 @@
{{#if @model.isGlobal}}
<Rose::Nav::Sidebar @title={{t 'titles.general'}} as |nav|>
<nav.link @route='scopes.scope.scopes'>
<Rose::Icon @name='app-icons/org' @size='medium' />
<Rose::Icon @name='flight-icons/org-16' @size='medium' />
{{t 'resources.org.title_plural'}}
</nav.link>
</Rose::Nav::Sidebar>
@@ -28,12 +28,12 @@
<Rose::Nav::Sidebar @title={{t 'titles.general'}} as |nav|>
{{#if this.session.data.authenticated.isGlobal}}
<nav.link @route='scopes.scope.scopes' @model='global'>
<Rose::Icon @name='app-icons/org' @size='medium' />
<Rose::Icon @name='flight-icons/org-16' @size='medium' />
{{t 'resources.org.title_plural'}}
</nav.link>
{{/if}}
<nav.link @route='scopes.scope.scopes'>
<Rose::Icon @name='app-icons/project' @size='medium' />
<Rose::Icon @name='flight-icons/grid-16' @size='medium' />
{{t 'resources.project.title_plural'}}
</nav.link>
</Rose::Nav::Sidebar>
@@ -43,12 +43,12 @@
<Rose::Nav::Sidebar @title={{t 'titles.general'}} as |nav|>
{{#if this.session.data.authenticated.isGlobal}}
<nav.link @route='scopes.scope.scopes' @model='global'>
<Rose::Icon @name='app-icons/org' @size='medium' />
<Rose::Icon @name='flight-icons/org-16' @size='medium' />
{{t 'resources.org.title_plural'}}
</nav.link>
{{/if}}
<nav.link @route='scopes.scope.scopes' @model={{@model.scopeID}}>
<Rose::Icon @name='app-icons/project' @size='medium' />
<Rose::Icon @name='flight-icons/grid-16' @size='medium' />
{{t 'resources.project.title_plural'}}
</nav.link>
</Rose::Nav::Sidebar>
@@ -58,13 +58,13 @@
<Rose::Nav::Sidebar @title={{t "titles.iam"}} as |nav|>
<nav.link @route="scopes.scope.groups">
<Rose::Icon
@name="app-icons/group"
@name="flight-icons/folder-users-16"
@size="medium" />
{{t "resources.group.title_plural"}}
</nav.link>
<nav.link @route="scopes.scope.roles">
<Rose::Icon
@name="app-icons/roles"
@name="flight-icons/identity-user-16"
@size="medium" />
{{t "resources.role.title_plural"}}
</nav.link>
@@ -72,20 +72,20 @@
--}}
<Rose::Nav::Sidebar @title={{t 'titles.resources'}} as |nav|>
<nav.link @route='scopes.scope.sessions'>
<Rose::Icon @name='app-icons/action-session' @size='medium' />
<Rose::Icon @name='flight-icons/entry-point-16' @size='medium' />
{{t 'resources.session.title_plural'}}
</nav.link>
<nav.link @route='scopes.scope.targets'>
<Rose::Icon @name='app-icons/target' @size='medium' />
<Rose::Icon @name='flight-icons/crosshair-16' @size='medium' />
{{t 'resources.target.title_plural'}}
</nav.link>
<nav.link @route='scopes.scope.host-catalogs'>
<Rose::Icon @name='app-icons/host-catalogs' @size='medium' />
<Rose::Icon @name='flight-icons/collections-16' @size='medium' />
{{t 'resources.host-catalog.title_plural'}}
</nav.link>
{{#if (feature-flag 'credential-store')}}
<nav.link @route='scopes.scope.credential-stores'>
<Rose::Icon @name='app-icons/credentials' @size='medium' />
<Rose::Icon @name='flight-icons/key-16' @size='medium' />
{{t 'resources.credential-store.title_plural'}}
</nav.link>
{{/if}}
@@ -95,21 +95,24 @@
{{#unless @model.isProject}}
<Rose::Nav::Sidebar @title={{t 'titles.iam'}} as |nav|>
<nav.link @route='scopes.scope.users'>
<Rose::Icon @name='app-icons/users' @size='medium' />
<Rose::Icon @name='flight-icons/users-16' @size='medium' />
{{t 'resources.user.title_plural'}}
</nav.link>
<nav.link @route='scopes.scope.groups'>
<Rose::Icon @name='app-icons/group' @size='medium' />
<Rose::Icon @name='flight-icons/folder-users-16' @size='medium' />
{{t 'resources.group.title_plural'}}
</nav.link>
{{#if (can 'navigate collection' @model collection='roles')}}
<nav.link @route='scopes.scope.roles'>
<Rose::Icon @name='app-icons/roles' @size='medium' />
<Rose::Icon
@name='flight-icons/identity-user-16'
@size='medium'
/>
{{t 'resources.role.title_plural'}}
</nav.link>
{{/if}}
<nav.link @route='scopes.scope.auth-methods'>
<Rose::Icon @name='app-icons/auth-method' @size='medium' />
<Rose::Icon @name='flight-icons/lock-16' @size='medium' />
{{t 'resources.auth-method.title_plural'}}
</nav.link>
</Rose::Nav::Sidebar>
@@ -2,8 +2,8 @@
@text={{this.scopes.selectedOrg.displayName}}
@icon={{if
this.scopes.selectedOrg.isGlobal
'app-icons/global'
'app-icons/org'
'flight-icons/globe-16'
'flight-icons/org-16'
}}
as |dropdown|
>
@@ -23,7 +23,7 @@
{{#if this.scopes.selectedProject}}
<Rose::Dropdown
@text={{this.scopes.selectedProject.displayName}}
@icon='app-icons/project'
@icon='flight-icons/grid-16'
as |dropdown|
>
{{#each this.scopes.projects as |scope|}}
@@ -1,18 +1,18 @@
<Rose::Nav::Sidebar @title={{t 'titles.iam'}} as |nav|>
<nav.link @route='scopes.scope.users'>
<Rose::Icon @name='app-icons/users' @size='medium' />
<Rose::Icon @name='flight-icons/users-16' @size='medium' />
{{t 'resources.user.title_plural'}}
</nav.link>
<nav.link @route='scopes.scope.groups'>
<Rose::Icon @name='app-icons/group' @size='medium' />
<Rose::Icon @name='flight-icons/folder-users-16' @size='medium' />
{{t 'resources.group.title_plural'}}
</nav.link>
<nav.link @route='scopes.scope.roles'>
<Rose::Icon @name='app-icons/roles' @size='medium' />
<Rose::Icon @name='flight-icons/identity-user-16' @size='medium' />
{{t 'resources.role.title_plural'}}
</nav.link>
<nav.link @route='scopes.scope.auth-methods'>
<Rose::Icon @name='app-icons/auth-method' @size='medium' />
<Rose::Icon @name='flight-icons/lock-16' @size='medium' />
{{t 'resources.auth-method.title_plural'}}
</nav.link>
</Rose::Nav::Sidebar>
@@ -3,8 +3,10 @@
@text={{t (concat 'states.' @model.attributes.state)}}
@icon={{if
@model.isInactive
'disabled'
(if @model.isPrivate 'lock-closed-outline' 'check-circle-outline')
'flight-icons/x-circle-16'
(if
@model.isPrivate 'flight-icons/lock-16' 'flight-icons/check-circle-16'
)
}}
@dropdownRight={{true}}
as |dropdown|
@@ -115,7 +115,7 @@
{{t 'resources.account.messages.welcome.description'}}
</message.description>
<message.link @route='scopes.scope.auth-methods.auth-method.accounts.new'>
<Rose::Icon @name='plus-circle-outline' />
<Rose::Icon @name='flight-icons/plus-circle-16' />
{{t 'resources.account.actions.create'}}
</message.link>
</Rose::Message>
@@ -129,7 +129,7 @@
@dropdownRight={{true}}
@iconOnly={{true}}
@showCaret={{false}}
@icon='more-horizontal'
@icon='flight-icons/more-horizontal-16'
as |dropdown|
>
{{#unless authMethod.isPrimary}}
@@ -171,7 +171,7 @@
@route='scopes.scope.auth-methods.new'
@query={{hash type='password'}}
>
<Rose::Icon @name='plus-circle-outline' />
<Rose::Icon @name='flight-icons/plus-circle-16' />
{{t 'titles.new'}}
</message.link>
</Rose::Message>
@@ -16,7 +16,7 @@
}}</p>
<Rose::Dropdown
@text={{t 'actions.choose-different-org'}}
@icon='user-organization'
@icon='flight-icons/org-16'
as |dropdown|
>
<dropdown.link @route='scopes.scope.authenticate' @model='global'>
@@ -79,7 +79,7 @@
<Rose::Layout::Centered>
<Rose::Message
@title={{t 'resources.auth-method.messages.none.title'}}
@icon='alert-circle-outline'
@icon='flight-icons/alert-circle-16'
as |message|
>
<message.description>
@@ -2,7 +2,7 @@
<Rose::Layout::Centered>
<Rose::Message
@title={{t 'resources.auth-method.messages.none.title'}}
@icon='alert-circle-outline'
@icon='flight-icons/alert-circle-16'
as |message|
>
<message.description>
@@ -58,7 +58,7 @@
<message.link
@route='scopes.scope.credential-stores.credential-store.credential-libraries.new'
>
<Rose::Icon @name='plus-circle-outline' />
<Rose::Icon @name='flight-icons/plus-circle-16' />
{{t 'titles.new'}}
</message.link>
</Rose::Message>
@@ -82,7 +82,7 @@
{{t 'resources.credential-store.description'}}
</message.description>
<message.link @route='scopes.scope.credential-stores.new'>
<Rose::Icon @name='plus-circle-outline' />
<Rose::Icon @name='flight-icons/plus-circle-16' />
{{t 'titles.new'}}
</message.link>
</Rose::Message>
@@ -27,7 +27,7 @@
</row.cell>
<row.cell>
<Rose::Dropdown
@icon='more-horizontal'
@icon='flight-icons/more-horizontal-16'
@iconOnly={{true}}
@showCaret={{false}}
@dropdownRight={{true}}
@@ -58,7 +58,7 @@
{{t 'resources.group.messages.members.description'}}
</message.description>
<message.link @route='scopes.scope.groups.group.add-members'>
<Rose::Icon @name='plus-circle-outline' />
<Rose::Icon @name='flight-icons/plus-circle-16' />
{{t 'resources.group.actions.add-members'}}
</message.link>
</Rose::Message>
@@ -72,7 +72,7 @@
{{t 'resources.group.description'}}
</message.description>
<message.link @route='scopes.scope.groups.new'>
<Rose::Icon @name='plus-circle-outline' />
<Rose::Icon @name='flight-icons/plus-circle-16' />
{{t 'titles.new'}}
</message.link>
</Rose::Message>
@@ -37,7 +37,7 @@
</row.cell>
<row.cell>
<Rose::Dropdown
@icon='more-horizontal'
@icon='flight-icons/more-horizontal-16'
@iconOnly={{true}}
@showCaret={{false}}
@dropdownRight={{true}}
@@ -70,7 +70,7 @@
</message.description>
{{!--
<message.link @route="scopes.scope.host-catalogs.host-catalog.host-sets.host-set.create-and-add-host">
<Rose::Icon @name="plus-circle-outline" />
<Rose::Icon @name="flight-icons/plus-circle-16" />
{{t "resources.host-set.actions.create-and-add-host"}}
</message.link>
--}}
@@ -56,7 +56,7 @@
<message.link
@route='scopes.scope.host-catalogs.host-catalog.host-sets.new'
>
<Rose::Icon @name='plus-circle-outline' />
<Rose::Icon @name='flight-icons/plus-circle-16' />
{{t 'titles.new'}}
</message.link>
</Rose::Message>
@@ -58,7 +58,7 @@
{{t 'resources.host.description'}}
</message.description>
<message.link @route='scopes.scope.host-catalogs.host-catalog.hosts.new'>
<Rose::Icon @name='plus-circle-outline' />
<Rose::Icon @name='flight-icons/plus-circle-16' />
{{t 'titles.new'}}
</message.link>
</Rose::Message>
@@ -85,7 +85,7 @@
{{t 'resources.host-catalog.description'}}
</message.description>
<message.link @route='scopes.scope.host-catalogs.new'>
<Rose::Icon @name='plus-circle-outline' />
<Rose::Icon @name='flight-icons/plus-circle-16' />
{{t 'titles.new'}}
</message.link>
</Rose::Message>
@@ -89,7 +89,7 @@
</message.description>
{{#if (can 'create collection' this.scope collection='roles')}}
<message.link @route='scopes.scope.roles.new'>
<Rose::Icon @name='plus-circle-outline' />
<Rose::Icon @name='flight-icons/plus-circle-16' />
{{t 'titles.new'}}
</message.link>
{{/if}}
@@ -31,7 +31,7 @@
</row.cell>
<row.cell>
<Rose::Dropdown
@icon='more-horizontal'
@icon='flight-icons/more-horizontal-16'
@iconOnly={{true}}
@showCaret={{false}}
@dropdownRight={{true}}
@@ -62,7 +62,7 @@
{{t 'resources.role.principal.messages.welcome.description'}}
</message.description>
<message.link @route='scopes.scope.roles.role.add-principals'>
<Rose::Icon @name='plus-circle-outline' />
<Rose::Icon @name='flight-icons/plus-circle-16' />
{{t 'resources.role.principal.actions.add-principals'}}
</message.link>
</Rose::Message>
@@ -43,7 +43,11 @@
@title={{scope.name}}
@description={{scope.description}}
@id={{scope.id}}
@icon={{if scope.isOrg 'app-icons/org' 'app-icons/project'}}
@icon={{if
scope.isOrg
'flight-icons/org-16'
'flight-icons/grid-16'
}}
@route='scopes.scope'
@model={{scope.id}}
/>
@@ -62,7 +66,7 @@
{{t 'resources.org.description'}}
</message.description>
<message.link @route='scopes.scope.new'>
<Rose::Icon @name='plus-circle-outline' />
<Rose::Icon @name='flight-icons/plus-circle-16' />
{{t 'titles.new'}}
</message.link>
</Rose::Message>
@@ -79,7 +83,7 @@
{{t 'resources.project.description'}}
</message.description>
<message.link @route='scopes.scope.new'>
<Rose::Icon @name='plus-circle-outline' />
<Rose::Icon @name='flight-icons/plus-circle-16' />
{{t 'titles.new'}}
</message.link>
</Rose::Message>
@@ -36,7 +36,7 @@
'session-status-'
sessionAggregate.session.status
}}
@name='app-icons/action-session'
@name='flight-icons/entry-point-16'
@size='medium'
/>
<Copyable
@@ -82,7 +82,7 @@
{{t 'resources.target.description'}}
</message.description>
<message.link @route='scopes.scope.targets.new'>
<Rose::Icon @name='plus-circle-outline' />
<Rose::Icon @name='flight-icons/plus-circle-16' />
{{t 'titles.new'}}
</message.link>
</Rose::Message>
@@ -19,7 +19,7 @@
{{t 'resources.target.credential-library.messages.none.description'}}
</message.description>
<message.link @route='scopes.scope.targets.target.credential-libraries'>
<Rose::Icon @name='chevron-left' />
<Rose::Icon @name='flight-icons/chevron-left-16' />
{{t 'actions.back'}}
</message.link>
</Rose::Message>
@@ -20,7 +20,7 @@
{{t 'resources.target.host-set.messages.none.description'}}
</message.description>
<message.link @route='scopes.scope.targets.target.host-sets'>
<Rose::Icon @name='chevron-left' />
<Rose::Icon @name='flight-icons/chevron-left-16' />
{{t 'actions.back'}}
</message.link>
</Rose::Message>
@@ -44,7 +44,7 @@
</row.cell>
<row.cell>
<Rose::Dropdown
@icon='more-horizontal'
@icon='flight-icons/more-horizontal-16'
@iconOnly={{true}}
@showCaret={{false}}
@dropdownRight={{true}}
@@ -82,7 +82,7 @@
<message.link
@route='scopes.scope.targets.target.add-credential-libraries'
>
<Rose::Icon @name='plus-circle-outline' />
<Rose::Icon @name='flight-icons/plus-circle-16' />
{{t 'resources.target.actions.add-credential-libraries'}}
</message.link>
</Rose::Message>
@@ -34,7 +34,7 @@
</row.cell>
<row.cell>
<Rose::Dropdown
@icon='more-horizontal'
@icon='flight-icons/more-horizontal-16'
@iconOnly={{true}}
@showCaret={{false}}
@dropdownRight={{true}}
@@ -68,7 +68,7 @@
{{t 'resources.target.host-set.messages.welcome.description'}}
</message.description>
<message.link @route='scopes.scope.targets.target.add-host-sets'>
<Rose::Icon @name='plus-circle-outline' />
<Rose::Icon @name='flight-icons/plus-circle-16' />
{{t 'resources.target.actions.add-host-sets'}}
</message.link>
</Rose::Message>
@@ -71,7 +71,7 @@
{{t 'resources.user.description'}}
</message.description>
<message.link @route='scopes.scope.users.new'>
<Rose::Icon @name='plus-circle-outline' />
<Rose::Icon @name='flight-icons/plus-circle-16' />
{{t 'titles.new'}}
</message.link>
</Rose::Message>
@@ -34,7 +34,7 @@
</row.cell>
<row.cell>
<Rose::Dropdown
@icon='more-horizontal'
@icon='flight-icons/more-horizontal-16'
@iconOnly={{true}}
@showCaret={{false}}
@dropdownRight={{true}}
@@ -68,7 +68,7 @@
{{t 'resources.user.messages.accounts.description'}}
</message.description>
<message.link @route='scopes.scope.users.user.add-accounts'>
<Rose::Icon @name='plus-circle-outline' />
<Rose::Icon @name='flight-icons/plus-circle-16' />
{{t 'resources.user.actions.add-accounts'}}
</message.link>
</Rose::Message>
@@ -20,7 +20,7 @@
{{t 'resources.user.messages.no-accounts.description'}}
</message.description>
<message.link @route='scopes.scope.users.user.accounts'>
<Rose::Icon @name='chevron-left' />
<Rose::Icon @name='flight-icons/chevron-left-16' />
{{t 'actions.back'}}
</message.link>
</Rose::Message>
+1 -1
View File
@@ -50,7 +50,7 @@
"ember-a11y-testing": "^4.0.7",
"ember-auto-import": "^1.10.1",
"ember-breadcrumbs": "^0.2.3",
"ember-cli": "~3.27.0",
"ember-cli": "~3.28.0",
"ember-cli-app-version": "^5.0.0",
"ember-cli-babel": "^7.23.0",
"ember-cli-code-coverage": "^1.0.2",