mirror of
https://github.com/status-im/consul.git
synced 2025-02-12 21:56:46 +00:00
d49ee8e355
We noticed that the Service Instance listing on both Node and Service views where not taking into account proxy instance health. This fixes that up so that the small health check information in each Service Instance row includes the proxy instances health checks when displaying Service Instance health (afterall if the proxy instance is unhealthy then so is the service instance that it should be proxying) * Refactor Consul::InstanceChecks with docs * Add to-hash helper, which will return an object keyed by a prop * Stop using/relying on ember-data type things, just use a hash lookup * For the moment add an equivalent "just give me proxies" model prop * Start stitching things together, this one requires an extra HTTP request ..previously we weren't even requesting proxies instances here * Finish up the stitching * Document Consul::ServiceInstance::List while I'm here * Fix up navigation mocks Name > Service
88 lines
2.3 KiB
Handlebars
88 lines
2.3 KiB
Handlebars
<Route
|
|
@name={{routeName}}
|
|
as |route|>
|
|
<div class="tab-section">
|
|
{{#let
|
|
|
|
(hash
|
|
value=(or sortBy "Status:asc")
|
|
change=(action (mut sortBy) value="target.selected")
|
|
)
|
|
|
|
(hash
|
|
status=(hash
|
|
value=(if status (split status ',') undefined)
|
|
change=(action (mut status) value="target.selectedItems")
|
|
)
|
|
source=(hash
|
|
value=(if source (split source ',') undefined)
|
|
change=(action (mut source) value="target.selectedItems")
|
|
)
|
|
searchproperty=(hash
|
|
value=(if (not-eq searchproperty undefined)
|
|
(split searchproperty ',')
|
|
searchProperties
|
|
)
|
|
change=(action (mut searchproperty) value="target.selectedItems")
|
|
default=searchProperties
|
|
)
|
|
)
|
|
|
|
route.model.items
|
|
route.model.proxies.firstObject
|
|
|
|
as |sort filters items proxyMeta|}}
|
|
{{#if (gt items.length 0) }}
|
|
<input type="checkbox" id="toolbar-toggle" />
|
|
<Consul::ServiceInstance::SearchBar
|
|
@sources={{get (collection items) 'ExternalSources'}}
|
|
@search={{search}}
|
|
@onsearch={{action (mut search) value="target.value"}}
|
|
|
|
@sort={{sort}}
|
|
|
|
@filter={{filters}}
|
|
/>
|
|
{{/if}}
|
|
{{#if proxyMeta.ServiceName}}
|
|
<DataSource
|
|
@src={{uri '/${partition}/${nspace}/${dc}/service-instances/for-service/${name}'
|
|
(hash
|
|
partition=route.params.partition
|
|
nspace=route.params.nspace
|
|
dc=route.params.dc
|
|
name=proxyMeta.ServiceName
|
|
)
|
|
}}
|
|
@onchange={{action (mut proxies) value="data"}}
|
|
/>
|
|
{{/if}}
|
|
{{! Service > Service Instance view doesn't require filtering of proxies }}
|
|
<DataCollection
|
|
@type="service-instance"
|
|
@sort={{sort.value}}
|
|
@filters={{filters}}
|
|
@search={{search}}
|
|
@items={{items}}
|
|
as |collection|>
|
|
<collection.Collection>
|
|
<Consul::ServiceInstance::List
|
|
@routeName="dc.services.instance"
|
|
@items={{collection.items}}
|
|
@proxies={{proxies}}
|
|
/>
|
|
</collection.Collection>
|
|
<collection.Empty>
|
|
<EmptyState>
|
|
<BlockSlot @name="body">
|
|
<p>
|
|
There are no instances{{#if (gt items.length 0)}} matching that search{{/if}}.
|
|
</p>
|
|
</BlockSlot>
|
|
</EmptyState>
|
|
</collection.Empty>
|
|
</DataCollection>
|
|
{{/let}}
|
|
</div>
|
|
</Route>
|