CyberCoveLLC/threshold-ui
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: 🤖 add scope column to role principals and group members (#1184)

Browse Source 
Co-authored-by: Carlos Alcaide Corvo <ccorvo@hashicorp.com>
This commit is contained in:
Randall MoreyandCarlos Alcaide Corvo authored and GitHub committed 2022-07-18 14:26:26 -07:00
1 parent bdabcc119e
commit 817d2a44e1
5 files changed
+29 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ui/admin/app/components/form/group/add-members/index.hbs
+4
View File
@@ -18,6 +18,7 @@
<header.row as |row|>
<row.headerCell>{{t 'form.name.label'}}</row.headerCell>
<row.headerCell>{{t 'form.id.label'}}</row.headerCell>
<row.headerCell>{{t 'resources.scope.title'}}</row.headerCell>
<row.headerCell>{{t 'form.description.label'}}</row.headerCell>
</header.row>
</table.header>
@@ -42,6 +43,9 @@
{{/if}}
</row.headerCell>
<row.cell><code>{{user.id}}</code></row.cell>
<row.cell>
<ScopeBadge @scope={{user.scopeModel}} />
</row.cell>
<row.cell>{{user.description}}</row.cell>
</body.row>
{{/each}}
ui/admin/app/components/form/role/add-principals/index.hbs
+4 -1
View File
@@ -19,6 +19,7 @@
<row.headerCell>{{t 'form.name.label'}}</row.headerCell>
<row.headerCell>{{t 'form.id.label'}}</row.headerCell>
<row.headerCell>{{t 'form.type.label'}}</row.headerCell>
<row.headerCell>{{t 'resources.scope.title'}}</row.headerCell>
<row.headerCell>{{t 'form.description.label'}}</row.headerCell>
</header.row>
</table.header>
@@ -37,7 +38,6 @@
components without resorting to heavy-handed grids
or contextualization. This is a one-off.
}}
<br />
&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;
<Rose::Badge>{{principal.accountName}}</Rose::Badge>
{{/if}}
@@ -51,6 +51,9 @@
)
}}</Rose::Badge>
</row.cell>
<row.cell>
<ScopeBadge @scope={{principal.scopeModel}} />
</row.cell>
<row.cell>{{principal.description}}</row.cell>
</body.row>
{{/each}}
ui/admin/app/components/scope-badge/index.hbs
+7
View File
@@ -0,0 +1,7 @@
<Rose::Badge
@icon={{if
@scope.isProject
'flight-icons/svg/grid-16'
(if @scope.isOrg 'flight-icons/svg/org-16' 'flight-icons/svg/globe-16')
}}
>{{@scope.displayName}}</Rose::Badge>
ui/admin/app/templates/scopes/scope/groups/group/members.hbs
+4
View File
@@ -26,6 +26,7 @@
<header.row as |row|>
<row.headerCell>{{t 'form.name.label'}}</row.headerCell>
<row.headerCell>{{t 'form.id.label'}}</row.headerCell>
<row.headerCell>{{t 'resources.scope.title'}}</row.headerCell>
<row.headerCell>{{t 'titles.actions'}}</row.headerCell>
</header.row>
</table.header>
@@ -47,6 +48,9 @@
<code>{{member.id}}</code>
</Copyable>
</row.cell>
<row.cell>
<ScopeBadge @scope={{member.scopeModel}} />
</row.cell>
<row.cell>
{{#if (can 'removeMembers group' @model.group)}}
<Rose::Dropdown
ui/admin/app/templates/scopes/scope/roles/role/principals.hbs
+10 -4
View File
@@ -36,8 +36,9 @@
<table.header as |header|>
<header.row as |row|>
<row.headerCell>{{t 'form.name.label'}}</row.headerCell>
<row.headerCell>{{t 'form.type.label'}}</row.headerCell>
<row.headerCell>{{t 'form.id.label'}}</row.headerCell>
<row.headerCell>{{t 'form.type.label'}}</row.headerCell>
<row.headerCell>{{t 'resources.scope.title'}}</row.headerCell>
<row.headerCell>{{t 'titles.actions'}}</row.headerCell>
</header.row>
</table.header>
@@ -51,9 +52,6 @@
>{{principal.model.accountName}}</Rose::Badge>
{{/if}}
</row.headerCell>
<row.cell>
{{t (concat 'resources.role.principal.types.' principal.type)}}
</row.cell>
<row.cell>
<Copyable
@text={{principal.model.id}}
@@ -63,6 +61,14 @@
<code>{{principal.model.id}}</code>
</Copyable>
</row.cell>
<row.cell>
<Rose::Badge>{{t
(concat 'resources.role.principal.types.' principal.type)
}}</Rose::Badge>
</row.cell>
<row.cell>
<ScopeBadge @scope={{principal.model.scopeModel}} />
</row.cell>
<row.cell>
{{#if (can 'removePrincipals role' @model.role)}}
<Rose::Dropdown