Skip to content

Commit

Permalink
Renaming undefinedIntention to be notDefinedIntention
Browse files Browse the repository at this point in the history
  • Loading branch information
kaxcode committed May 21, 2021
1 parent f3c75d6 commit 319ad3b
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
8 changes: 4 additions & 4 deletions ui/packages/consul-ui/app/models/topology.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export default class Topology extends Model {
@attr() meta; // {}

@computed('Downstreams')
get undefinedIntention() {
get notDefinedIntention() {
let undefinedDownstream = false;

undefinedDownstream =
Expand All @@ -32,11 +32,11 @@ export default class Topology extends Model {
return undefinedDownstream;
}

@computed('FilteredByACL', 'DefaultAllow', 'WildcardIntention', 'undefinedIntention')
@computed('FilteredByACL', 'DefaultAllow', 'WildcardIntention', 'notDefinedIntention')
get collapsible() {
if (this.DefaultAllow && this.FilteredByACLs && this.undefinedIntention) {
if (this.DefaultAllow && this.FilteredByACLs && this.notDefinedIntention) {
return true;
} else if (this.WildcardIntention && this.FilteredByACLs && this.undefinedIntention) {
} else if (this.WildcardIntention && this.FilteredByACLs && this.notDefinedIntention) {
return true;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ as |route|>
@action={{true}}
/>
{{/if}}
{{#if topology.undefinedIntention}}
{{#if topology.notDefinedIntention}}
<TopologyMetrics::Notice
data-test-notice='undefined-intention'
data-test-notice='not-defined-intention'
@type="warning"
@for="not-defined-intention"
@link="{{env 'CONSUL_DOCS_URL'}}/connect/registration/service-registration#upstreams"
Expand Down Expand Up @@ -88,9 +88,9 @@ as |route|>
@action={{true}}
/>
{{/if}}
{{#if topology.undefinedIntention}}
{{#if topology.notDefinedIntention}}
<TopologyMetrics::Notice
data-test-notice='undefined-intention'
data-test-notice='not-defined-intention'
@type="warning"
@for="not-defined-intention"
@link="{{env 'CONSUL_DOCS_URL'}}/connect/registration/service-registration#upstreams"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ Feature: dc / services / show / topology / tproxy
service: web
---
Then the url should be /datacenter/services/web/topology
And I see the tabs.topologyTab.undefinedIntention object
And I see the tabs.topologyTab.notDefinedIntention object
Scenario: TProxy for a downstream is set to true
Given 1 topology model from yaml
---
Expand All @@ -94,7 +94,7 @@ Feature: dc / services / show / topology / tproxy
service: web
---
Then the url should be /datacenter/services/web/topology
And I don't see the tabs.topologyTab.undefinedIntention object
And I don't see the tabs.topologyTab.notDefinedIntention object



Expand Down
4 changes: 2 additions & 2 deletions ui/packages/consul-ui/tests/pages/dc/services/show.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ export default function(
wildcardIntention: {
see: isPresent('[data-test-notice="wildcard-intention"]'),
},
undefinedIntention: {
see: isPresent('[data-test-notice="undefined-intention"]'),
notDefinedIntention: {
see: isPresent('[data-test-notice="not-defined-intention"]'),
},
};
page.tabs.upstreamsTab = {
Expand Down

0 comments on commit 319ad3b

Please sign in to comment.