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

ui: Revert to Services route as default (#12804) 

* ui: Revert to Services route as default
* ui: update page navigation tests to match routing change
This commit is contained in:
Evan Rowe 2022-04-18 09:03:13 -07:00 committed by GitHub
parent a050aa39b9
commit 05e5722153
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/packages/consul-ui/app/templates/application.hbs
View File

@ -50,7 +50,9 @@ as |source|>
{{! until we get to the dc route we don't know any permissions }}
{{! as we don't know the dc, any inital permission based }}
{{! redirects are in the dc.show route}}
{{did-insert (route-action 'replaceWith' 'dc.show'
{{! 2022-04-15: Temporarily reverting the services page to the default }}
{{did-insert (route-action 'replaceWith' 'dc.services.index'
(hash
dc=(env 'CONSUL_DATACENTER_LOCAL')
)

2
ui/packages/consul-ui/tests/acceptance/dc/forwarding.feature
View File

@ -10,4 +10,4 @@ Feature: dc / forwarding
---
dc: datacenter
---
Then the url should be /datacenter/overview/server-status
Then the url should be /datacenter/services

2
ui/packages/consul-ui/tests/acceptance/index-forwarding.feature
View File

@ -4,4 +4,4 @@ Feature: index-forwarding
Scenario: Arriving at the index page when there is only one datacenter
Given 1 datacenter model with the value "dc1"
When I visit the index page
Then the url should be /dc1/overview/server-status
Then the url should be /dc1/services

2
ui/packages/consul-ui/tests/acceptance/page-navigation.feature
View File

@ -10,7 +10,7 @@ Feature: page-navigation
---
dc: dc1
---
Then the url should be /dc1/overview/server-status
Then the url should be /dc1/services
Scenario: Clicking [Link] in the navigation takes me to [URL]
When I visit the services page for yaml
---

12
ui/packages/consul-ui/vendor/consul-ui/routes.js vendored
View File

@ -7,32 +7,32 @@
index: {
_options: {
path: '/',
redirect: '../show/serverstatus',
redirect: '../services',
},
},
show: {
_options: {
path: '/overview',
abilities: ['access overview']
abilities: ['access overview'],
},
serverstatus: {
_options: {
path: '/server-status',
abilities: ['access overview', 'read zones']
abilities: ['access overview', 'read zones'],
},
},
cataloghealth: {
_options: {
path: '/catalog-health',
abilities: ['access overview']
abilities: ['access overview'],
},
},
license: {
_options: {
path: '/license',
abilities: ['access overview', 'read licence']
abilities: ['access overview', 'read licence'],
},
},
}
},
services: {
_options: { path: '/services' },