status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

ui: Fixup names of Meta for instance search, also add Node (#11774)

This commit is contained in:
John Cowen 2021-12-21 07:00:02 +00:00 committed by GitHub
parent 2c1eb052e3
commit 2f6ae96ccd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.changelog/11774.txt Normal file
View File

@ -0,0 +1,4 @@
```release-note:bug
ui: Differentiate between Service Meta and Node Meta when choosing search fields
in Service Instance listings
```

2
ui/packages/consul-ui/app/routes/dc/services/show/instances.js
View File

@ -7,7 +7,7 @@ export default class InstancesRoute extends Route {
source: 'source', source: 'source',
searchproperty: { searchproperty: {
as: 'searchproperty', as: 'searchproperty',
empty: [['Name', 'Tags', 'ID', 'Address', 'Port', 'Service.Meta', 'Node.Meta']], empty: [['Name', 'Node', 'Tags', 'ID', 'Address', 'Port', 'Service.Meta', 'Node.Meta']],
}, },
search: { search: {
as: 'filter', as: 'filter',

1
ui/packages/consul-ui/app/search/predicates/service-instance.js
View File

@ -1,5 +1,6 @@
export default { export default {
Name: item => item.Name, Name: item => item.Name,
Node: item => item.Node.Node,
Tags: item => item.Service.Tags || [], Tags: item => item.Service.Tags || [],
ID: item => item.Service.ID || '', ID: item => item.Service.ID || '',
Address: item => item.Address || '', Address: item => item.Address || '',

2
ui/packages/consul-ui/translations/common/en-us.yaml
View File

@ -30,6 +30,8 @@ consul:
terminating-gateway: Terminating Gateway terminating-gateway: Terminating Gateway
mesh-gateway: Mesh Gateway mesh-gateway: Mesh Gateway
status: Health Status status: Health Status
service.meta: Service Meta
node.meta: Node Meta
service-name: Service Name service-name: Service Name
node-name: Node Name node-name: Node Name
accessorid: AccessorID accessorid: AccessorID