ui: Change text around L7 permissions to app aware (#8963)

...also as a consequence of this we also moved around some of the CSS
This commit is contained in:
John Cowen 2020-10-19 15:45:50 +01:00 committed by GitHub
parent 8ff996145a
commit 02dcd422fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 65 additions and 59 deletions

View File

@ -0,0 +1,34 @@
%pill-allow::before,
%pill-deny::before,
%pill-l7::before {
@extend %as-pseudo;
margin-right: 5px;
font-size: 0.9em;
}
%pill-allow,
%pill-deny,
%pill-l7 {
display: inline-block;
font-weight: $typo-weight-normal;
font-size: $typo-size-600;
}
%pill-allow {
color: $green-800;
background-color: $green-100;
}
%pill-deny {
color: $red-800;
background-color: $red-100;
}
%pill-l7 {
@extend %frame-gray-900;
}
%pill-allow::before {
@extend %with-arrow-right-color-mask;
}
%pill-deny::before {
@extend %with-deny-color-mask;
}
%pill-l7::before {
@extend %with-layers-mask;
}

View File

@ -119,7 +119,7 @@
) )
(hash (hash
intent="" intent=""
header="L7 Permissions" header="Application Aware"
body="The source service may or may not connect to the destination service via unique permissions based on L7 criteria: path, header, or method." body="The source service may or may not connect to the destination service via unique permissions based on L7 criteria: path, header, or method."
) )
) )

View File

@ -0,0 +1,8 @@
@import './components';
@import './search-bar';
@import './list';
@import './form/fieldsets';
@import './permission/list';
@import './permission/form';
@import './permission/header/list';

View File

@ -12,7 +12,7 @@
td.intent-deny strong { td.intent-deny strong {
@extend %pill-deny; @extend %pill-deny;
} }
td.intent-l7-rules strong { td.intent- strong {
@extend %pill-l7; @extend %pill-l7;
} }
.notice.allow { .notice.allow {

View File

@ -6,13 +6,13 @@
width: calc(30% - 50px); width: calc(30% - 50px);
} }
tr > *:nth-child(2) { tr > *:nth-child(2) {
width: 100px; width: 120px;
} }
tr > *:nth-child(3) { tr > *:nth-child(3) {
width: calc(30% - 50px); width: calc(30% - 50px);
} }
tr > *:nth-child(4) { tr > *:nth-child(4) {
width: calc(40% - 220px); width: calc(40% - 240px);
} }
tr > *:nth-child(5) { tr > *:nth-child(5) {
width: 160px; width: 160px;

View File

@ -28,11 +28,9 @@ as |item index|>
<em class={{concat 'nspace-' (or item.SourceNS 'default')}}>{{or item.SourceNS 'default'}}</em> <em class={{concat 'nspace-' (or item.SourceNS 'default')}}>{{or item.SourceNS 'default'}}</em>
</a> </a>
</td> </td>
{{#let (or item.Action "L7 rules") as |intent|}} <td class="intent intent-{{slugify item.Action}}" data-test-intention-action={{item.Action}}>
<td class="intent intent-{{slugify intent}}" data-test-intention-action={{intent}}> <strong>{{capitalize (or item.Action "App aware")}}</strong>
<strong>{{capitalize intent}}</strong>
</td> </td>
{{/let}}
<td class="destination" data-test-intention-destination={{item.DestinationName}}> <td class="destination" data-test-intention-destination={{item.DestinationName}}>
<span> <span>
{{#if (eq item.DestinationName '*') }} {{#if (eq item.DestinationName '*') }}

View File

@ -6,7 +6,7 @@
as |item|> as |item|>
<BlockSlot @name="details"> <BlockSlot @name="details">
<div onclick={{action (optional onclick) item}}> <div onclick={{action (optional onclick) item}}>
<strong class={{concat 'intent-' item.Action}}>{{item.Action}}</strong> <strong class={{concat 'intent-' item.Action}}>{{capitalize item.Action}}</strong>
{{#if (gt item.HTTP.Methods.length 0)}} {{#if (gt item.HTTP.Methods.length 0)}}
<dl class="permission-methods"> <dl class="permission-methods">
<dt> <dt>

View File

@ -1,4 +1,4 @@
<form class="filter-bar"> <form class="consul-intention-search-bar filter-bar">
<FreetextFilter <FreetextFilter
@onsearch={{action onsearch}} @onsearch={{action onsearch}}
@value={{search}} @value={{search}}
@ -12,13 +12,13 @@
as |components|> as |components|>
<BlockSlot @name="selected"> <BlockSlot @name="selected">
<span> <span>
Permissions Intent
</span> </span>
</BlockSlot> </BlockSlot>
<BlockSlot @name="options"> <BlockSlot @name="options">
{{#let components.Optgroup components.Option as |Optgroup Option|}} {{#let components.Optgroup components.Option as |Optgroup Option|}}
<Option @value="allow" @selected={{contains 'allow' filter.accesses}}>Allow</Option> <Option class="value-allow" @value="allow" @selected={{contains 'allow' filter.accesses}}>Allow</Option>
<Option @value="deny" @selected={{contains 'deny' filter.accesses}}>Deny</Option> <Option class="value-deny" @value="deny" @selected={{contains 'deny' filter.accesses}}>Deny</Option>
{{/let}} {{/let}}
</BlockSlot> </BlockSlot>
</PopoverSelect> </PopoverSelect>

View File

@ -0,0 +1,9 @@
.consul-intention-search-bar {
.value-allow button::before {
@extend %with-arrow-right-color-mask, %as-pseudo;
color: $green-500;
}
.value-deny button::before {
@extend %with-deny-color-icon, %as-pseudo;
}
}

View File

@ -19,5 +19,4 @@
%pill-700 { %pill-700 {
@extend %pill; @extend %pill;
padding: 4px 8px; padding: 4px 8px;
min-width: 87px;
} }

View File

@ -64,11 +64,7 @@
@import 'consul-ui/components/consul/exposed-path/list'; @import 'consul-ui/components/consul/exposed-path/list';
@import 'consul-ui/components/consul/external-source'; @import 'consul-ui/components/consul/external-source';
@import 'consul-ui/components/consul/kind'; @import 'consul-ui/components/consul/kind';
@import 'consul-ui/components/consul/intention/list'; @import 'consul-ui/components/consul/intention';
@import 'consul-ui/components/consul/intention/form/fieldsets';
@import 'consul-ui/components/consul/intention/permission/list';
@import 'consul-ui/components/consul/intention/permission/form';
@import 'consul-ui/components/consul/intention/permission/header/list';
@import 'consul-ui/components/role-selector'; @import 'consul-ui/components/role-selector';
@import 'consul-ui/components/topology-metrics'; @import 'consul-ui/components/topology-metrics';
@import 'consul-ui/components/topology-metrics/series'; @import 'consul-ui/components/topology-metrics/series';

View File

@ -33,37 +33,3 @@ span.policy-service-identity::before {
%pill.leader::before { %pill.leader::before {
@extend %with-star-outline-mask, %as-pseudo; @extend %with-star-outline-mask, %as-pseudo;
} }
%pill-allow:before,
%pill-deny:before,
%pill-l7:before {
@extend %as-pseudo;
margin-right: 5px;
font-size: 0.9em;
}
%pill-allow,
%pill-deny,
%pill-l7 {
text-transform: capitalize;
font-weight: $typo-weight-normal;
font-size: $typo-size-600;
}
%pill-allow {
color: $green-800;
background-color: $green-100;
}
%pill-deny {
color: $red-800;
background-color: $red-100;
}
%pill-l7 {
@extend %frame-gray-900;
}
%pill-allow::before {
@extend %with-arrow-right-color-mask;
}
%pill-deny::before {
@extend %with-deny-color-mask;
}
%pill-l7::before {
@extend %with-layers-mask;
}

View File

@ -17,13 +17,10 @@
%popover-select.type-sort label > * { %popover-select.type-sort label > * {
@extend %sort-button; @extend %sort-button;
} }
%popover-select button::before {
%popover-select.type-access button::before,
%popover-select.type-source button::before,
%popover-select.type-status button::before {
margin-right: 10px; margin-right: 10px;
} }
%popover-select .value-allow button::before,
%popover-select .value-passing button::before { %popover-select .value-passing button::before {
@extend %with-check-circle-fill-mask, %as-pseudo; @extend %with-check-circle-fill-mask, %as-pseudo;
color: $green-500; color: $green-500;
@ -32,7 +29,6 @@
@extend %with-alert-triangle-mask, %as-pseudo; @extend %with-alert-triangle-mask, %as-pseudo;
color: $orange-500; color: $orange-500;
} }
%popover-select .value-deny button::before,
%popover-select .value-critical button::before { %popover-select .value-critical button::before {
@extend %with-cancel-square-fill-mask, %as-pseudo; @extend %with-cancel-square-fill-mask, %as-pseudo;
color: $red-500; color: $red-500;