eeb04ae436
* Add Partition to all our models * Add partitions into our serializers/fingerprinting * Make some amends to a few adapters ready for partitions * Amend blueprints to avoid linting error * Update all our repositories to include partitions, also Remove enabled/disable nspace repo and just use a nspace with conditionals * Ensure nspace and parition parameters always return '' no matter what * Ensure data-sink finds the model properly This will later be replaced by a @dataSink decorator but we are find kicking that can down the road a little more * Add all the new partition data layer * Add a way to set the title of the page from inside the route and make it accessibile via a route announcer * Make the Consul Route the default/basic one * Tweak nspace and partition abilities not to check the length * Thread partition through all the components that need it * Some ACL tweaks * Move the entire app to use partitions * Delete all the tests we no longer need * Update some Unit tests to use partition * Fix up KV title tests * Fix up a few more acceptance tests * Fixup and temporarily ignore some acceptance tests * Stop using ember-cli-page-objects fillable as it doesn't seem to work * Fix lint error * Remove old ACL related test * Add a tick after filling out forms * Fix token warning modal * Found some more places where we need a partition var * Fixup some more acceptance tests * Tokens still needs a repo service for CRUD * Remove acceptance tests we no longer need * Fixup and "FIXME ignore" a few tests * Remove an s * Disable blocking queries for KV to revert to previous release for now * Fixup adapter tests to follow async/function resolving interface * Fixup all the serializer integration tests * Fixup service/repo integration tests * Fixup deleting acceptance test * Fixup some ent tests * Make sure nspaces passes the dc through for when thats important * ...aaaand acceptance nspaces with the extra dc param
192 lines
7.1 KiB
Handlebars
192 lines
7.1 KiB
Handlebars
<Route
|
|
@name={{routeName}}
|
|
as |route|>
|
|
|
|
<DataLoader
|
|
@src={{uri '/${partition}/${nspace}/${dc}/service-instances/for-service/${name}'
|
|
(hash
|
|
partition=route.params.partition
|
|
nspace=route.params.nspace
|
|
dc=route.params.dc
|
|
name=route.params.name
|
|
)
|
|
}}
|
|
as |loader|>
|
|
|
|
<BlockSlot @name="error">
|
|
<AppError
|
|
@error={{loader.error}}
|
|
@login={{route.model.app.login.open}}
|
|
/>
|
|
</BlockSlot>
|
|
|
|
<BlockSlot @name="disconnected" as |Notification|>
|
|
{{#if (eq loader.error.status "404")}}
|
|
<Notification @sticky={{true}}>
|
|
<p data-notification role="alert" class="warning notification-update">
|
|
<strong>Warning!</strong>
|
|
This service has been deregistered and no longer exists in the catalog.
|
|
</p>
|
|
</Notification>
|
|
{{else if (eq loader.error.status "403")}}
|
|
<Notification @sticky={{true}}>
|
|
<p data-notification role="alert" class="error notification-update">
|
|
<strong>Error!</strong>
|
|
You no longer have access to this service
|
|
</p>
|
|
</Notification>
|
|
{{else}}
|
|
<Notification @sticky={{true}}>
|
|
<p data-notification role="alert" class="warning notification-update">
|
|
<strong>Warning!</strong>
|
|
An error was returned whilst loading this data, refresh to try again.
|
|
</p>
|
|
</Notification>
|
|
{{/if}}
|
|
</BlockSlot>
|
|
|
|
<BlockSlot @name="loaded">
|
|
{{#let
|
|
loader.data
|
|
loader.data.firstObject
|
|
route.model.dc
|
|
as |items item dc|}}
|
|
|
|
{{#if item.IsOrigin}}
|
|
<DataSource
|
|
@src={{uri '/${partition}/${nspace}/${dc}/proxies/for-service/${name}'
|
|
(hash
|
|
partition=route.params.partition
|
|
nspace=route.params.nspace
|
|
dc=route.params.dc
|
|
name=route.params.name
|
|
)
|
|
}}
|
|
@onchange={{action (mut proxies) value="data"}}
|
|
/>
|
|
{{! currently we use the discovery chain endpoint to understand whether }}
|
|
{{! connect is enabled/disabled. We get a 500 error when its disabled }}
|
|
{{! and use this to set MeshEnabled on the Datacenter }}
|
|
{{! if once chain is set, i.e. we've checked this dc we remove the DataSource }}
|
|
{{! which will mark it for closure, which possibly could be reopened if }}
|
|
{{! the user clicks the routing/disco-chain tab}}
|
|
{{#if (not chain)}}
|
|
<DataSource
|
|
@src={{uri '/${partition}/${nspace}/${dc}/discovery-chain/${name}'
|
|
(hash
|
|
partition=route.params.partition
|
|
nspace=route.params.nspace
|
|
dc=route.params.dc
|
|
name=route.params.name
|
|
)
|
|
}}
|
|
@onchange={{action (mut chain) value="data"}}
|
|
/>
|
|
{{/if}}
|
|
{{/if}}
|
|
{{#let
|
|
(hash
|
|
topology=(and dc.MeshEnabled item.IsMeshOrigin (or (gt proxies.length 0) (eq item.Service.Kind 'ingress-gateway')))
|
|
services=(eq item.Service.Kind 'terminating-gateway')
|
|
upstreams=(eq item.Service.Kind 'ingress-gateway')
|
|
instances=true
|
|
intentions=(not-eq item.Service.Kind 'terminating-gateway')
|
|
routing=(and dc.MeshEnabled item.IsOrigin)
|
|
tags=(not item.Service.Kind)
|
|
)
|
|
as |tabs|}}
|
|
<AppView>
|
|
<BlockSlot @name="notification" as |status type item error|>
|
|
<TopologyMetrics::Notifications
|
|
@type={{type}}
|
|
@status={{status}}
|
|
@error={{error}}
|
|
/>
|
|
</BlockSlot>
|
|
<BlockSlot @name="breadcrumbs">
|
|
<ol>
|
|
<li><a data-test-back href={{href-to 'dc.services'}}>All Services</a></li>
|
|
</ol>
|
|
</BlockSlot>
|
|
<BlockSlot @name="header">
|
|
<h1>
|
|
<route.Title @title={{item.Service.Service}} />
|
|
</h1>
|
|
<Consul::ExternalSource @item={{item.Service}} />
|
|
<Consul::Kind @item={{item.Service}} @withInfo={{true}} />
|
|
</BlockSlot>
|
|
<BlockSlot @name="nav">
|
|
{{#if (not-eq item.Service.Kind 'mesh-gateway')}}
|
|
<TabNav @items={{
|
|
compact
|
|
(array
|
|
(if tabs.topology
|
|
(hash label="Topology" href=(href-to "dc.services.show.topology") selected=(is-href "dc.services.show.topology"))
|
|
'')
|
|
(if tabs.services
|
|
(hash label="Linked Services" href=(href-to "dc.services.show.services") selected=(is-href "dc.services.show.services"))
|
|
'')
|
|
(if tabs.upstreams
|
|
(hash label="Upstreams" href=(href-to "dc.services.show.upstreams") selected=(is-href "dc.services.show.upstreams"))
|
|
'')
|
|
(if tabs.instances
|
|
(hash label="Instances" href=(href-to "dc.services.show.instances") selected=(is-href "dc.services.show.instances"))
|
|
'')
|
|
(if tabs.intentions
|
|
(hash label="Intentions" href=(href-to "dc.services.show.intentions") selected=(is-href "dc.services.show.intentions"))
|
|
'')
|
|
(if tabs.routing
|
|
(hash label="Routing" href=(href-to "dc.services.show.routing") selected=(is-href "dc.services.show.routing"))
|
|
'')
|
|
(if tabs.tags
|
|
(hash label="Tags" href=(href-to "dc.services.show.tags") selected=(is-href "dc.services.show.tags"))
|
|
'')
|
|
)
|
|
}}/>
|
|
{{/if}}
|
|
</BlockSlot>
|
|
<BlockSlot @name="actions">
|
|
<DataSource
|
|
@src={{uri '/${partition}/${nspace}/${dc}/ui-config'
|
|
(hash
|
|
partition=route.params.partition
|
|
nspace=route.params.nspace
|
|
dc=route.params.dc
|
|
)
|
|
}}
|
|
as |config|>
|
|
{{#if config.data.dashboard_url_templates.service}}
|
|
<a href={{render-template config.data.dashboard_url_templates.service (hash
|
|
Datacenter=dc.Name
|
|
Service=(hash Name=item.Service.Service)
|
|
)}}
|
|
target="_blank"
|
|
rel="noopener noreferrer"
|
|
data-test-dashboard-anchor
|
|
>
|
|
Open Dashboard
|
|
</a>
|
|
{{/if}}
|
|
</DataSource>
|
|
</BlockSlot>
|
|
<BlockSlot @name="content">
|
|
{{! if its not an origin service we don't care as to whether connect }}
|
|
{{! is enabled or not (we figure that out using the chain var) }}
|
|
{{#if (or (not item.IsOrigin) chain)}}
|
|
<Outlet
|
|
@name={{routeName}}
|
|
@model={{assign (hash
|
|
items=items
|
|
tabs=tabs
|
|
) route.model}}
|
|
as |o|>
|
|
{{outlet}}
|
|
</Outlet>
|
|
{{/if}}
|
|
</BlockSlot>
|
|
</AppView>
|
|
{{/let}}
|
|
{{/let}}
|
|
</BlockSlot>
|
|
</DataLoader>
|
|
</Route> |