diff --git a/.changelog/11774.txt b/.changelog/11774.txt new file mode 100644 index 0000000000..bf52d2c3ad --- /dev/null +++ b/.changelog/11774.txt @@ -0,0 +1,4 @@ +```release-note:bug +ui: Differentiate between Service Meta and Node Meta when choosing search fields +in Service Instance listings +``` diff --git a/ui/packages/consul-ui/app/routes/dc/services/show/instances.js b/ui/packages/consul-ui/app/routes/dc/services/show/instances.js index 139124a7d5..5c27d6497c 100644 --- a/ui/packages/consul-ui/app/routes/dc/services/show/instances.js +++ b/ui/packages/consul-ui/app/routes/dc/services/show/instances.js @@ -7,7 +7,7 @@ export default class InstancesRoute extends Route { source: 'source', 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: { as: 'filter', diff --git a/ui/packages/consul-ui/app/search/predicates/service-instance.js b/ui/packages/consul-ui/app/search/predicates/service-instance.js index 1792f6372d..0f059e580d 100644 --- a/ui/packages/consul-ui/app/search/predicates/service-instance.js +++ b/ui/packages/consul-ui/app/search/predicates/service-instance.js @@ -1,5 +1,6 @@ export default { Name: item => item.Name, + Node: item => item.Node.Node, Tags: item => item.Service.Tags || [], ID: item => item.Service.ID || '', Address: item => item.Address || '', diff --git a/ui/packages/consul-ui/translations/common/en-us.yaml b/ui/packages/consul-ui/translations/common/en-us.yaml index fe1f462b4f..e5700effe7 100644 --- a/ui/packages/consul-ui/translations/common/en-us.yaml +++ b/ui/packages/consul-ui/translations/common/en-us.yaml @@ -30,6 +30,8 @@ consul: terminating-gateway: Terminating Gateway mesh-gateway: Mesh Gateway status: Health Status + service.meta: Service Meta + node.meta: Node Meta service-name: Service Name node-name: Node Name accessorid: AccessorID