review note fixes

This commit is contained in:
kenia 2021-04-14 18:52:41 -04:00
parent f2d8c6fadf
commit b62042fe44
9 changed files with 14 additions and 15 deletions

View File

@ -1,4 +1,4 @@
{{#if (eq @item.Name '*(All Services)')}}
{{#if (eq @item.Name '* (All Services)')}}
<a class="topology-metrics-card" href={{href-to 'dc.services.index'}}>
<p class="empty">
{{@item.Name}}

View File

@ -92,7 +92,7 @@
/>
{{else if (and item.Intention.Allowed (not item.TransparentProxy) (eq item.Source 'specific-intention'))}}
<TopologyMetrics::Popover
@type='notDefined'
@type='not-defined'
@position={{find-by 'id' (concat this.guid item.Namespace item.Name) this.iconPositions}}
@item={{item}}
@oncreate={{action @oncreate item @service}}

View File

@ -73,7 +73,7 @@ export default class TopologyMetrics extends Component {
const wildcardIntention = get(this.args.topology, 'WildcardIntention');
if (defaultAllow || wildcardIntention) {
items.push({
Name: '*(All Services)',
Name: '* (All Services)',
Datacenter: '',
Namespace: '',
Intention: {

View File

@ -1,7 +1,7 @@
<Notice
class="topology-metrics-notice"
...attributes
@type={{or @type}}
@type={{@type}}
as |notice|>
<notice.Header>
<h3>

View File

@ -47,25 +47,25 @@
</Actions.Action>
</:actions>
</InformedAction>
{{else if (eq @type 'notDefined')}}
{{else if (eq @type 'not-defined')}}
<InformedAction
class="warning documentation"
{{did-insert (set this 'popover')}}
>
<:header>
<h3>
{{t "components.consul.topology-metrics.popover.notDefined.header"}}
{{t "components.consul.topology-metrics.popover.not-defined.header"}}
</h3>
</:header>
<:body>
<p>
{{t "components.consul.topology-metrics.popover.notDefined.body"}}
{{t "components.consul.topology-metrics.popover.not-defined.body"}}
</p>
</:body>
<:actions as |Actions|>
<Actions.Action class="action">
<a href="{{env 'CONSUL_DOCS_URL'}}/connect/registration/service-registration#upstreams" rel="noopener noreferrer" target="_blank">
{{t "components.consul.topology-metrics.popover.notDefined.action"}}
{{t "components.consul.topology-metrics.popover.not-defined.action"}}
</a>
</Actions.Action>
<Actions.Action>

View File

@ -27,8 +27,8 @@
@extend %with-layers-mask, %as-pseudo;
background-color: $gray-300;
}
&.notDefined > button::before,
&.notDefined .tippy-arrow::after {
&.not-defined > button::before,
&.not-defined .tippy-arrow::after {
@extend %with-alert-triangle-mask, %as-pseudo;
color: $yellow-500;
}

View File

@ -65,7 +65,7 @@
stroke: $gray-300;
stroke-width: 2;
}
path[data-permission='notDefined'] {
path[data-permission='not-defined'] {
stroke-dasharray: 4;
}
path[data-permission='deny'] {

View File

@ -11,7 +11,7 @@ export default helper(function serviceIntentionPermissions([params] /*, hash*/)
case !allowed && !hasPermissions:
return 'deny';
case allowed && notExplicitlyDefined:
return 'notDefined';
return 'not-defined';
default:
return 'allow';
}

View File

@ -202,8 +202,7 @@ components:
not-defined-intention:
header: Connections are not explicitly defined
body: There appears to be an Intention defining traffic, but the services are unable to communicate until that connection is explicitly defined as a downstream or Transparent Proxy mode is turned on.
footer:
name: Read the documentation
footer: Read the documentation
wildcard-intention:
header: Permissive Intention
body: One or more of your Intentions are set to allow traffic to and/or from all other services in a namespace. This Topology view will show all of those connections if that remains unchanged. We recommend setting more specific Intentions for upstream and downstream services to make this vizualization more useful.
@ -223,7 +222,7 @@ components:
action:
isExact: Allow
notExact: Create
undefined:
not-defined:
header: No traffic
body: Add the current service as an explicit upstream or turn on Transparent Proxy mode to initiate traffic.
action: Documentation