luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

ui: Closes the proxy blocking query for the service instance on dereg (#5667) 

If a service instance show page is being viewed and the service instance
is deregistered, this closes the blocking query for the proxy as well as
the instance (the instances query will be clsed on the error)

Also adds skipped tests to nag in future
This commit is contained in:
John Cowen 2019-04-17 09:21:54 +01:00 committed by John Cowen
parent 62ba4c9722
commit d18ef6fa02
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui-v2/app/controllers/dc/services/instance.js
View File

@ -22,6 +22,10 @@ export default Controller.extend(WithEventSource, {
type: 'warning', type: 'warning',
action: 'update', action: 'update',
}); });
const proxy = get(this, 'proxy');
if (proxy) {
proxy.close();
}
} }
} }
}), }),

3
ui-v2/tests/acceptance/dc/services/instances/show.feature
View File

@ -82,4 +82,7 @@ Feature: dc / services / instances / show: Show Service Instance
Then the url should be /dc1/services/service-0/service-0-with-id Then the url should be /dc1/services/service-0/service-0-with-id
And an external edit results in 0 instance models And an external edit results in 0 instance models
And pause until I see the text "deregistered" in "[data-notification]" And pause until I see the text "deregistered" in "[data-notification]"
@ignore
Scenario: A Service Instance's proxy blocking query is closed when the instance is deregistered
Then ok