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
153 lines
5.6 KiB
Handlebars
153 lines
5.6 KiB
Handlebars
<Route
|
|
@name={{routeName}}
|
|
as |route|>
|
|
<DataLoader
|
|
@src={{uri '/${partition}/${nspace}/${dc}/service-instance/${id}/${node}/${name}'
|
|
(hash
|
|
partition=route.params.partition
|
|
nspace=route.params.nspace
|
|
dc=route.params.dc
|
|
id=route.params.id
|
|
node=route.params.node
|
|
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
|
|
|
|
as |item|}}
|
|
{{#if item.IsOrigin}}
|
|
<DataSource
|
|
@src={{uri '/${partition}/${nspace}/${dc}/proxy-instance/${id}/${node}/${name}'
|
|
(hash
|
|
partition=route.params.partition
|
|
nspace=route.params.nspace
|
|
dc=route.params.dc
|
|
id=route.params.id
|
|
node=route.params.node
|
|
name=route.params.name
|
|
)
|
|
}}
|
|
as |meta|>
|
|
{{! We only really need meta to get the correct ServiceID }}
|
|
{{! but we may as well use the NodeName and ServiceName }}
|
|
{{! from meta also, but they should be the same as the instance }}
|
|
{{! so if we can ever get ServiceID from elsewhere we could save }}
|
|
{{! a HTTP request/long poll here }}
|
|
{{#if meta.data.ServiceID}}
|
|
<DataSource
|
|
@src={{uri '/${partition}/${nspace}/${dc}/proxy-service-instance/${id}/${node}/${name}'
|
|
(hash
|
|
partition=route.params.partition
|
|
nspace=route.params.nspace
|
|
dc=route.params.dc
|
|
id=meta.data.ServiceID
|
|
node=meta.data.NodeName
|
|
name=meta.data.ServiceName
|
|
)
|
|
}}
|
|
@onchange={{action (mut proxy) value="data"}}/>
|
|
{{/if}}
|
|
</DataSource>
|
|
{{/if}}
|
|
<AppView>
|
|
<BlockSlot @name="breadcrumbs">
|
|
<ol>
|
|
<li><a href={{href-to 'dc.services'}}>All Services</a></li>
|
|
<li><a data-test-back href={{href-to 'dc.services.show'}}>Service ({{item.Service.Service}})</a></li>
|
|
</ol>
|
|
</BlockSlot>
|
|
<BlockSlot @name="header">
|
|
<h1>
|
|
<route.Title @title={{item.Service.ID}} />
|
|
</h1>
|
|
<Consul::ExternalSource @item={{item}} />
|
|
<Consul::Kind @item={{item}} @withInfo={{true}} />
|
|
{{#if (eq proxy.ServiceProxy.Mode 'transparent')}}
|
|
<Consul::TransparentProxy />
|
|
{{/if}}
|
|
</BlockSlot>
|
|
<BlockSlot @name="nav">
|
|
<dl>
|
|
<dt>Service Name</dt>
|
|
<dd><a href="{{href-to 'dc.services.show' item.Service.Service}}">{{item.Service.Service}}</a></dd>
|
|
</dl>
|
|
<dl>
|
|
<dt>Node Name</dt>
|
|
<dd><a href="{{href-to 'dc.nodes.show' item.Node.Node}}">{{item.Node.Node}}</a></dd>
|
|
</dl>
|
|
</BlockSlot>
|
|
<BlockSlot @name="actions">
|
|
{{#let (or item.Service.Address item.Node.Address) as |address|}}
|
|
<CopyButton @value={{address}} @name="Address">{{address}}</CopyButton>
|
|
{{/let}}
|
|
</BlockSlot>
|
|
<BlockSlot @name="content">
|
|
<TabNav @items={{
|
|
compact
|
|
(array
|
|
(hash label="Health Checks" href=(href-to "dc.services.instance.healthchecks") selected=(is-href "dc.services.instance.healthchecks"))
|
|
(if
|
|
(eq item.Service.Kind 'mesh-gateway')
|
|
(hash label="Addresses" href=(href-to "dc.services.instance.addresses") selected=(is-href "dc.services.instance.addresses")) ""
|
|
)
|
|
(if proxy
|
|
(hash label="Upstreams" href=(href-to "dc.services.instance.upstreams") selected=(is-href "dc.services.instance.upstreams"))
|
|
)
|
|
(if proxy
|
|
(hash label="Exposed Paths" href=(href-to "dc.services.instance.exposedpaths") selected=(is-href "dc.services.instance.exposedpaths"))
|
|
)
|
|
(hash label="Tags & Meta" href=(href-to "dc.services.instance.metadata") selected=(is-href "dc.services.instance.metadata"))
|
|
)
|
|
}}/>
|
|
<Outlet
|
|
@name={{routeName}}
|
|
@model={{assign (hash
|
|
proxy=proxy
|
|
item=item
|
|
) route.model}}
|
|
as |o|>
|
|
{{outlet}}
|
|
</Outlet>
|
|
</BlockSlot>
|
|
</AppView>
|
|
{{/let}}
|
|
</BlockSlot>
|
|
</DataLoader>
|
|
</Route> |