-
-
-
-
{{/if}}
-
+
-
+
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/components/popover-menu/index.hbs b/ui/packages/consul-ui/app/components/popover-menu/index.hbs
index b7ccd11b85f..002cb048da7 100644
--- a/ui/packages/consul-ui/app/components/popover-menu/index.hbs
+++ b/ui/packages/consul-ui/app/components/popover-menu/index.hbs
@@ -3,7 +3,6 @@
SPDX-License-Identifier: BUSL-1.1
}}
-{{yield}}
\ No newline at end of file
+
diff --git a/ui/packages/consul-ui/app/components/popover-menu/index.js b/ui/packages/consul-ui/app/components/popover-menu/index.js
index 57358f361b5..b77e689fba1 100644
--- a/ui/packages/consul-ui/app/components/popover-menu/index.js
+++ b/ui/packages/consul-ui/app/components/popover-menu/index.js
@@ -6,10 +6,9 @@
/*eslint ember/closure-actions: "warn"*/
import Component from '@ember/component';
import { inject as service } from '@ember/service';
-import Slotted from 'block-slots';
import { set } from '@ember/object';
-export default Component.extend(Slotted, {
+export default Component.extend({
tagName: '',
dom: service('dom'),
expanded: false,
@@ -23,10 +22,6 @@ export default Component.extend(Slotted, {
this.guid = this.dom.guid(this);
this.submenus = [];
},
- willRender: function () {
- this._super(...arguments);
- set(this, 'hasHeader', this._isRegistered('header'));
- },
actions: {
addSubmenu: function (name) {
set(this, 'submenus', this.submenus.concat(name));
diff --git a/ui/packages/consul-ui/app/components/popover-menu/menu-item/index.hbs b/ui/packages/consul-ui/app/components/popover-menu/menu-item/index.hbs
index 3ea7fdb8b79..df2cb1a4326 100644
--- a/ui/packages/consul-ui/app/components/popover-menu/menu-item/index.hbs
+++ b/ui/packages/consul-ui/app/components/popover-menu/menu-item/index.hbs
@@ -3,9 +3,8 @@
SPDX-License-Identifier: BUSL-1.1
}}
-{{yield}}
- {{#if this.hasConfirmation}}
+ {{#if (has-block "confirmFooter")}}
{{#if this.formModalActive}}
@@ -25,31 +28,35 @@
as |M|
>
-
+ {{#if (has-block "confirmHeader")}}
+ {{yield to="confirmHeader"}}
+ {{else}}
{{yield}}
-
+ {{/if}}
-
+ {{#if (has-block "confirmBody")}}
+ {{yield to="confirmBody"}}
+ {{else}}
{{yield}}
-
+ {{/if}}
-
-
+ {{#if (has-block "confirmFooter")}}
+ {{yield
(hash
button=(component 'popover-menu/menu-item/critical-button' confirmAction=(queue (action this.menu.clickTrigger) (action this.onclick) F.close))
btnAtts=(hash data-test-id='confirm-action')
confirmAction=(queue (action this.menu.clickTrigger) (action this.onclick) F.close)
close=F.close
)
+ to="confirmFooter"
}}
- >
+ {{else}}
{{yield}}
-
+ {{/if}}
{{/in-element}}
@@ -64,9 +71,11 @@
target={{if external '_blank'}}
rel={{if external 'noopener noreferrer'}}
>
-
+ {{#if (has-block "label")}}
+ {{yield to="label"}}
+ {{else}}
{{yield}}
-
+ {{/if}}
{{/let}}
{{else}}
@@ -78,9 +87,11 @@
(action (if this.close this.menu.clickTrigger (noop)))
}}
>
-
+ {{#if (has-block "label")}}
+ {{yield to="label"}}
+ {{else}}
{{yield}}
-
+ {{/if}}
{{/if}}
-
\ No newline at end of file
+
diff --git a/ui/packages/consul-ui/app/components/popover-menu/menu-item/index.js b/ui/packages/consul-ui/app/components/popover-menu/menu-item/index.js
index a67bb93e08d..e5abc9ecfdb 100644
--- a/ui/packages/consul-ui/app/components/popover-menu/menu-item/index.js
+++ b/ui/packages/consul-ui/app/components/popover-menu/menu-item/index.js
@@ -7,9 +7,7 @@ import Component from '@ember/component';
import { inject as service } from '@ember/service';
import { set } from '@ember/object';
-import Slotted from 'block-slots';
-
-export default Component.extend(Slotted, {
+export default Component.extend({
tagName: '',
dom: service('dom'),
@@ -31,10 +29,6 @@ export default Component.extend(Slotted, {
this._super(...arguments);
this.menu.removeSubmenu(this.guid);
},
- willRender: function () {
- this._super(...arguments);
- set(this, 'hasConfirmation', this._isRegistered('confirm-footer'));
- },
actions: {
activateModal(modalName) {
diff --git a/ui/packages/consul-ui/app/components/popover-menu/menu-separator/index.hbs b/ui/packages/consul-ui/app/components/popover-menu/menu-separator/index.hbs
index 6d3012119d8..d99a27d0a22 100644
--- a/ui/packages/consul-ui/app/components/popover-menu/menu-separator/index.hbs
+++ b/ui/packages/consul-ui/app/components/popover-menu/menu-separator/index.hbs
@@ -3,7 +3,10 @@
SPDX-License-Identifier: BUSL-1.1
}}
{{!-- template-lint-disable require-presentational-children --}}
-{{yield}}
- {{yield}}
+ {{#if (has-block "label")}}
+ {{yield to="label"}}
+ {{else}}
+ {{yield}}
+ {{/if}}
diff --git a/ui/packages/consul-ui/app/components/popover-menu/menu-separator/index.js b/ui/packages/consul-ui/app/components/popover-menu/menu-separator/index.js
index c93303764fa..b9f3eb8f0e2 100644
--- a/ui/packages/consul-ui/app/components/popover-menu/menu-separator/index.js
+++ b/ui/packages/consul-ui/app/components/popover-menu/menu-separator/index.js
@@ -5,8 +5,6 @@
import Component from '@ember/component';
-import Slotted from 'block-slots';
-
-export default Component.extend(Slotted, {
+export default Component.extend({
tagName: '',
});
diff --git a/ui/packages/consul-ui/app/components/popover-select/index.hbs b/ui/packages/consul-ui/app/components/popover-select/index.hbs
index b3d6d9a349d..3b9a5ca2c64 100644
--- a/ui/packages/consul-ui/app/components/popover-select/index.hbs
+++ b/ui/packages/consul-ui/app/components/popover-select/index.hbs
@@ -7,35 +7,41 @@
class="popover-select"
...attributes
@position={{or @position "left"}}
- as |components menu|
>
- {{yield}}
- {{#let
- (component 'popover-select/optgroup' components=components)
- (component 'popover-select/option'
- select=this components=components
- onclick=(pipe
- (action "click")
- (if this.multiple (noop) menu.toggle)
+ <:trigger as |components menu|>
+ {{#let
+ (component 'popover-select/optgroup' components=components)
+ (component 'popover-select/option'
+ select=this components=components
+ onclick=(pipe
+ (action "click")
+ (if this.multiple (noop) menu.toggle)
+ )
)
- )
- as |Optgroup Option|
- }}
-
-
- {{yield (hash
- Optgroup=Optgroup
- Option=Option
- )}}
-
-
-
-
- {{yield (hash
- Optgroup=Optgroup
- Option=Option
- )}}
-
-
- {{/let}}
+ as |Optgroup Option|
+ }}
+ {{yield (hash
+ Optgroup=Optgroup
+ Option=Option
+ ) to="selected"}}
+ {{/let}}
+
+ <:menu as |components menu|>
+ {{#let
+ (component 'popover-select/optgroup' components=components)
+ (component 'popover-select/option'
+ select=this components=components
+ onclick=(pipe
+ (action "click")
+ (if this.multiple (noop) menu.toggle)
+ )
+ )
+ as |Optgroup Option|
+ }}
+ {{yield (hash
+ Optgroup=Optgroup
+ Option=Option
+ ) to="options"}}
+ {{/let}}
+
diff --git a/ui/packages/consul-ui/app/components/popover-select/index.js b/ui/packages/consul-ui/app/components/popover-select/index.js
index 33f5560bc39..564a16994e5 100644
--- a/ui/packages/consul-ui/app/components/popover-select/index.js
+++ b/ui/packages/consul-ui/app/components/popover-select/index.js
@@ -5,9 +5,8 @@
import Component from '@ember/component';
import { inject as service } from '@ember/service';
-import Slotted from 'block-slots';
-export default Component.extend(Slotted, {
+export default Component.extend({
tagName: '',
dom: service('dom'),
multiple: false,
diff --git a/ui/packages/consul-ui/app/components/popover-select/optgroup/index.hbs b/ui/packages/consul-ui/app/components/popover-select/optgroup/index.hbs
index 772294c9fa9..a7cb55499c9 100644
--- a/ui/packages/consul-ui/app/components/popover-select/optgroup/index.hbs
+++ b/ui/packages/consul-ui/app/components/popover-select/optgroup/index.hbs
@@ -5,9 +5,9 @@
{{#let @components.MenuSeparator as |MenuSeparator|}}
-
+ <:label>
{{@label}}
-
+
{{yield}}
-{{/let}}
\ No newline at end of file
+{{/let}}
diff --git a/ui/packages/consul-ui/app/components/popover-select/option/index.hbs b/ui/packages/consul-ui/app/components/popover-select/option/index.hbs
index 66f4875c979..6ea5682b273 100644
--- a/ui/packages/consul-ui/app/components/popover-select/option/index.hbs
+++ b/ui/packages/consul-ui/app/components/popover-select/option/index.hbs
@@ -14,8 +14,8 @@
@onclick={{action @onclick this}}
@selected={{this.selected}}
>
-
+ <:label>
{{yield}}
-
+
{{/let}}
diff --git a/ui/packages/consul-ui/app/components/role-form/index.hbs b/ui/packages/consul-ui/app/components/role-form/index.hbs
index edba0b76f18..fd2208b6f9a 100644
--- a/ui/packages/consul-ui/app/components/role-form/index.hbs
+++ b/ui/packages/consul-ui/app/components/role-form/index.hbs
@@ -28,8 +28,8 @@
{{!TODO: temporary policies id, look at the inception token modals and get rid of id="policies" and use something else}}
diff --git a/ui/packages/consul-ui/app/components/role-selector/index.hbs b/ui/packages/consul-ui/app/components/role-selector/index.hbs
index 944b4e0ede8..fb1725b636e 100644
--- a/ui/packages/consul-ui/app/components/role-selector/index.hbs
+++ b/ui/packages/consul-ui/app/components/role-selector/index.hbs
@@ -11,16 +11,18 @@
@aria={{hash
label=(if (eq this.state 'role') 'New Role' 'New Policy')
}}
-as |modal|>
-
-
+>
+ <:default as |modal|>
+ New Role
{{else}}
New Policy
{{/if}}
-
-
+
+ <:body>
@nspace={{@nspace}}
@partition={{@partition}}
>
-
+ <:policy>
@nspace={{@nspace}}
@items={{this.item.Policies}}
>
-
+ <:trigger>
data-test-create-policy
{{action 'triggerStateCheckboxChange'}}
/>
-
+
-
+
@@ -64,8 +66,8 @@ as |modal|>
@partition={{@partition}}
/>
-
-
+
+ <:actions as |close|>
{{#if (eq this.state 'role')}}
@@ -101,7 +103,7 @@ as |modal|>
/>
{{/if}}
-
+
@placeholder="Search for role"
@items={{@items}}
>
-
+ <:label>
Apply an existing role
-
-
+
+ <:create>
data-test-role-create
{{on "click" (optional this.modal.open)}}
/>
-
-
+
+ <:option as |option|>
{{option.Name}}
-
-
+
+ <:set as |remove|>
-
+ <:header>
Name |
Description |
-
-
+
+ <:row as |item index|>
{{item.Name}}
|
{{item.Description}}
|
-
-
-
-
+
+ <:actions as |item index change checked|>
+
+ <:trigger>
More
-
-
+
+ <:menu as |components confirm keypressClick|>
-
+ <:label>
{{#if (can "edit role" item=item)}}
Edit
{{else}}
View
{{/if}}
-
+
{{#if (not @disabled)}}
-
+ <:label>
Remove
-
-
+
+ <:confirmHeader>
Confirm Remove
-
-
+
+ <:confirmBody>
Are you sure you want to remove this role?
-
-
+
+ <:confirmFooter as |Params|>
-
+
{{/if}}
-
+
-
+
-
+
diff --git a/ui/packages/consul-ui/app/components/tabular-collection/index.hbs b/ui/packages/consul-ui/app/components/tabular-collection/index.hbs
index 544b8a75a40..0a81c5c66ab 100644
--- a/ui/packages/consul-ui/app/components/tabular-collection/index.hbs
+++ b/ui/packages/consul-ui/app/components/tabular-collection/index.hbs
@@ -4,7 +4,7 @@
}}
{{on-window 'resize' (action "resize") }}
{{yield}}
-{{#if this.hasCaption}}
- {{yield}}
+{{#if (has-block "caption")}}
+ {{yield to="caption"}}
{{/if}}
- {{yield}}
-{{#if this.hasActions }}
+ {{yield to="header"}}
+{{#if (has-block 'actions')}}
| Actions |
{{/if}}
@@ -28,15 +28,13 @@
|
{{~#each this._cells as |cell index|~}}
- {{yield cell.item index}}
-{{#if this.hasActions }}
+ {{yield cell.item index to="row"}}
+{{#if (has-block 'actions')}}
|
-
- {{yield cell.item index}}
-
+ {{yield cell.item cell.index (action "change") this.checked to="actions"}}
|
{{/if}}
{{~/each~}}
-
\ No newline at end of file
+
diff --git a/ui/packages/consul-ui/app/components/tabular-collection/index.js b/ui/packages/consul-ui/app/components/tabular-collection/index.js
index c8d712496c1..16e777303ec 100644
--- a/ui/packages/consul-ui/app/components/tabular-collection/index.js
+++ b/ui/packages/consul-ui/app/components/tabular-collection/index.js
@@ -8,11 +8,10 @@ import { computed, set } from '@ember/object';
import CollectionComponent from 'ember-collection/components/ember-collection';
import needsRevalidate from 'ember-collection/utils/needs-revalidate';
import Grid from 'ember-collection/layouts/grid';
-import Slotted from 'block-slots';
const formatItemStyle = Grid.prototype.formatItemStyle;
-export default CollectionComponent.extend(Slotted, {
+export default CollectionComponent.extend({
tagName: '',
dom: service('dom'),
width: 1150,
@@ -59,11 +58,6 @@ export default CollectionComponent.extend(Slotted, {
},
}),
- willRender: function () {
- this._super(...arguments);
- set(this, 'hasCaption', this._isRegistered('caption'));
- set(this, 'hasActions', this._isRegistered('actions'));
- },
// `ember-collection` bug workaround
// https://github.com/emberjs/ember-collection/issues/138
_needsRevalidate: function () {
diff --git a/ui/packages/consul-ui/app/components/tabular-details/index.hbs b/ui/packages/consul-ui/app/components/tabular-details/index.hbs
index a7a9b590bd9..66b34b4f693 100644
--- a/ui/packages/consul-ui/app/components/tabular-details/index.hbs
+++ b/ui/packages/consul-ui/app/components/tabular-details/index.hbs
@@ -7,7 +7,7 @@
- {{yield}}
+ {{yield to="header"}}
| Actions |
@@ -15,7 +15,7 @@
{{#let (concat 'tabular-details-' @name '-toggle-' this.guid '_') as |inputId|}}
{{#each @items as |item index|}}
- {{yield item index}}
+ {{yield item index to="row"}}
|
|
@@ -26,9 +26,7 @@
-
- {{yield item index}}
-
+ {{yield item index to="details"}}
diff --git a/ui/packages/consul-ui/app/components/tabular-details/index.js b/ui/packages/consul-ui/app/components/tabular-details/index.js
index 471da2ad627..0e36729bd09 100644
--- a/ui/packages/consul-ui/app/components/tabular-details/index.js
+++ b/ui/packages/consul-ui/app/components/tabular-details/index.js
@@ -5,9 +5,8 @@
import Component from '@ember/component';
import { inject as service } from '@ember/service';
-import Slotted from 'block-slots';
-export default Component.extend(Slotted, {
+export default Component.extend({
dom: service('dom'),
onchange: function () {},
init: function () {
diff --git a/ui/packages/consul-ui/app/components/token-list/index.hbs b/ui/packages/consul-ui/app/components/token-list/index.hbs
index 0196ad2b216..7e766828475 100644
--- a/ui/packages/consul-ui/app/components/token-list/index.hbs
+++ b/ui/packages/consul-ui/app/components/token-list/index.hbs
@@ -9,26 +9,28 @@
data-test-tokens
class="token-list"
@rows={{5}}
- @items={{sort-by 'AccessorID:asc' @items}} as |item index|
+ @items={{sort-by 'AccessorID:asc' @items}}
>
- {{#if @caption}}
- {{@caption}}
- {{/if}}
-
- AccessorID |
- Scope |
- Description |
-
-
-
- {{truncate item.AccessorID 8 false}}
- |
-
- {{if item.Local 'local' 'global'}}
- |
-
- {{item.Description}}
- |
-
+ <:caption>
+ {{#if @caption}}
+ {{@caption}}
+ {{/if}}
+
+ <:header>
+ AccessorID |
+ Scope |
+ Description |
+
+ <:row as |item index|>
+
+ {{truncate item.AccessorID 8 false}}
+ |
+
+ {{if item.Local 'local' 'global'}}
+ |
+
+ {{item.Description}}
+ |
+
-{{/if}}
\ No newline at end of file
+{{/if}}
diff --git a/ui/packages/consul-ui/app/components/token-list/index.js b/ui/packages/consul-ui/app/components/token-list/index.js
index 440ea16a5fa..b9f3eb8f0e2 100644
--- a/ui/packages/consul-ui/app/components/token-list/index.js
+++ b/ui/packages/consul-ui/app/components/token-list/index.js
@@ -4,8 +4,7 @@
*/
import Component from '@ember/component';
-import SlotsMixin from 'block-slots';
-export default Component.extend(SlotsMixin, {
+export default Component.extend({
tagName: '',
});
diff --git a/ui/packages/consul-ui/app/components/topology-metrics/series/index.hbs b/ui/packages/consul-ui/app/components/topology-metrics/series/index.hbs
index 38bcc50b7d7..99b1142420e 100644
--- a/ui/packages/consul-ui/app/components/topology-metrics/series/index.hbs
+++ b/ui/packages/consul-ui/app/components/topology-metrics/series/index.hbs
@@ -51,12 +51,14 @@
@aria={{hash
label="Metrics Key"
}}
- as |modal|>
- Metrics Key
-
-
+
+ <:body>
This key describes the metrics corresponding to the graph tooltip labels in more detail.
@@ -69,14 +71,14 @@
No metrics loaded.
{{/unless}}
-
-
+
+ <:actions as |close|>
-
+
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/templates/dc/acls/auth-methods/index.hbs b/ui/packages/consul-ui/app/templates/dc/acls/auth-methods/index.hbs
index a372e499960..643b6185521 100644
--- a/ui/packages/consul-ui/app/templates/dc/acls/auth-methods/index.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/acls/auth-methods/index.hbs
@@ -14,10 +14,9 @@ as |route|>
partition=route.params.partition
nspace=route.params.nspace
dc=route.params.dc
- )}}
- as |loader|>
+ )}}>
-
+ <:error as |loader|>
{{#if (eq loader.error.status '401')}}
{{else}}
@@ -26,9 +25,9 @@ as |route|>
@login={{route.model.app.login.open}}
/>
{{/if}}
-
+
-
+ <:loaded as |loader|>
{{#let
(hash
@@ -63,12 +62,12 @@ as |route|>
-
+ <:header>
-
-
+
+ <:toolbar>
{{#if (gt items.length 0)}}
@filter={{filters}}
/>
{{/if}}
-
-
+
+ <:content>
-
+ <:header>
{{t 'routes.dc.acls.auth-methods.index.empty.header'
items=items.length
}}
-
-
+
+ <:body>
{{t 'routes.dc.acls.auth-methods.index.empty.body'
items=items.length
htmlSafe=true
}}
-
-
+
+ <:actions>
@size='small'
/>
-
+
-
+
{{/let}}
-
+
diff --git a/ui/packages/consul-ui/app/templates/dc/acls/auth-methods/show.hbs b/ui/packages/consul-ui/app/templates/dc/acls/auth-methods/show.hbs
index b14c3230571..d6853e6af76 100644
--- a/ui/packages/consul-ui/app/templates/dc/acls/auth-methods/show.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/acls/auth-methods/show.hbs
@@ -3,72 +3,79 @@
SPDX-License-Identifier: BUSL-1.1
}}
-
-
+
+ }}>
-
+ <:error as |loader|>
{{#if (eq loader.error.status '401')}}
{{else}}
-
+
{{/if}}
-
+
-
-{{#let
- loader.data
-as |item|}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{outlet}}
-
-
-
-{{/let}}
-
+ <:loaded as |loader|>
+ {{#let loader.data as |item|}}
+
+ <:breadcrumbs>
+
+
+
+
+ <:header>
+
+
+
+
+
+ <:nav>
+
+
+ <:content>
+
+ {{outlet}}
+
+
+
+ {{/let}}
+
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/templates/dc/acls/auth-methods/show/binding-rules.hbs b/ui/packages/consul-ui/app/templates/dc/acls/auth-methods/show/binding-rules.hbs
index 19271af94d9..12de2153b9b 100644
--- a/ui/packages/consul-ui/app/templates/dc/acls/auth-methods/show/binding-rules.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/acls/auth-methods/show/binding-rules.hbs
@@ -15,17 +15,17 @@ as |route|>
dc=route.params.dc
name=route.params.id
)
- }}
- as |loader|>
+ }}>
+
-
+ <:error as |loader|>
-
+
-
+ <:loaded as |loader|>
{{#let
loader.data
as |items|}}
@@ -45,26 +45,26 @@ as |items|}}
{{/each}}
{{else}}
-
+ <:header>
{{t 'routes.dc.acls.auth-methods.show.binding-rules.index.empty.header'}}
-
-
+
+ <:body>
{{t 'routes.dc.acls.auth-methods.show.binding-rules.index.empty.body'
htmlSafe=true
- }}
-
-
+ }}>
+
+ <:actions>
Read the documentation
-
+
{{/if}}
{{/let}}
-
+
diff --git a/ui/packages/consul-ui/app/templates/dc/acls/auth-methods/show/nspace-rules.hbs b/ui/packages/consul-ui/app/templates/dc/acls/auth-methods/show/nspace-rules.hbs
index d069a55bcee..e7897f54a8e 100644
--- a/ui/packages/consul-ui/app/templates/dc/acls/auth-methods/show/nspace-rules.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/acls/auth-methods/show/nspace-rules.hbs
@@ -17,21 +17,21 @@ as |item|}}
{{else}}
-
+ <:header>
{{compute (fn route.t 'empty.header')}}
-
-
+
+ <:body>
{{compute (fn route.t 'empty.body' (hash
htmlSafe=true
))}}
-
-
+
+ <:actions>
Read the documentation
-
+
{{/if}}
diff --git a/ui/packages/consul-ui/app/templates/dc/acls/policies/edit.hbs b/ui/packages/consul-ui/app/templates/dc/acls/policies/edit.hbs
index 27637c78f27..c8c2baec724 100644
--- a/ui/packages/consul-ui/app/templates/dc/acls/policies/edit.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/acls/policies/edit.hbs
@@ -14,10 +14,9 @@ as |route|>
dc=route.params.dc
id=(or route.params.id '')
)
- }}
- as |loader|>
+ }}>
-
+ <:error as |loader|>
{{#if (eq loader.error.status '401')}}
{{else}}
@@ -26,9 +25,9 @@ as |route|>
@login={{route.model.app.login.open}}
/>
{{/if}}
-
+
-
+ <:loaded as |loader|>
{{#let
route.params.dc
@@ -43,12 +42,12 @@ as |dc partition nspace id item create|}}
-
+ <:breadcrumbs>
-
-
+
+ <:header>
{{#if create }}
@@ -60,8 +59,8 @@ as |dc partition nspace id item create|}}
{{/if}}
{{/if}}
-
-
+
+ <:content>
{{#if (not create) }}
@@ -126,9 +125,9 @@ as |dc partition nspace id item create|}}
@onItemsChange={{action (mut this.items) value="data"}}
/>
{{/if}}
-
+
{{/let}}
-
+
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/templates/dc/acls/policies/index.hbs b/ui/packages/consul-ui/app/templates/dc/acls/policies/index.hbs
index 3783e9c859c..640c3300410 100644
--- a/ui/packages/consul-ui/app/templates/dc/acls/policies/index.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/acls/policies/index.hbs
@@ -13,10 +13,9 @@ as |route|>
partition=route.params.partition
nspace=route.params.nspace
dc=route.params.dc
- )}}
- as |loader|>
+ )}}>
-
+ <:error as |loader|>
{{#if (eq loader.error.status '401')}}
{{else}}
@@ -25,9 +24,9 @@ as |route|>
@login={{route.model.app.login.open}}
/>
{{/if}}
-
+
-
+ <:loaded as |loader|>
{{#let
(hash
@@ -60,12 +59,12 @@ as |route|>
-
+ <:header>
-
-
+
+ <:actions>
{{#if (can "create policies")}}
data-test-create
/>
{{/if}}
-
-
+
+ <:toolbar>
{{#if (gt items.length 0) }}
@filter={{filters}}
/>
{{/if}}
-
-
+
+ <:content>
-
+ <:header>
{{t 'routes.dc.acls.policies.index.empty.header'
items=items.length
}}
-
-
+
+ <:body>
{{t 'routes.dc.acls.policies.index.empty.body'
items=items.length
htmlSafe=true
}}
-
-
+
+ <:actions>
-
@size='small'
/>
-
+
-
+
{{/let}}
-
+
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/templates/dc/acls/roles/edit.hbs b/ui/packages/consul-ui/app/templates/dc/acls/roles/edit.hbs
index ce21b75b5ed..4b685ab0aa0 100644
--- a/ui/packages/consul-ui/app/templates/dc/acls/roles/edit.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/acls/roles/edit.hbs
@@ -14,10 +14,9 @@ as |route|>
dc=route.params.dc
id=(or route.params.id '')
)
- }}
- as |loader|>
+ }}>
-
+ <:error as |loader|>
{{#if (eq loader.error.status '401')}}
{{else}}
@@ -26,9 +25,9 @@ as |route|>
@login={{route.model.app.login.open}}
/>
{{/if}}
-
+
-
+ <:loaded as |loader|>
{{#let
route.params.dc
@@ -41,12 +40,12 @@ as |dc partition nspace item create|}}
-
+ <:breadcrumbs>
-
-
+
+ <:header>
{{#if create }}
@@ -54,8 +53,8 @@ as |dc partition nspace item create|}}
{{/if}}
-
-
+
+ <:content>
{{#if (not create) }}
@@ -84,9 +83,9 @@ as |dc partition nspace item create|}}
@onDelete={{fn this.onDelete item}}
@onItemsChange={{action (mut this.items) value="data"}}
/>
-
+
{{/let}}
-
+
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/templates/dc/acls/roles/index.hbs b/ui/packages/consul-ui/app/templates/dc/acls/roles/index.hbs
index ba6ecb528bc..1f7822db3fe 100644
--- a/ui/packages/consul-ui/app/templates/dc/acls/roles/index.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/acls/roles/index.hbs
@@ -14,10 +14,9 @@ as |route|>
partition=route.params.partition
nspace=route.params.nspace
dc=route.params.dc
- )}}
- as |loader|>
+ )}}>
-
+ <:error as |loader|>
{{#if (eq loader.error.status '401')}}
{{else}}
@@ -26,9 +25,9 @@ as |route|>
@login={{route.model.app.login.open}}
/>
{{/if}}
-
+
-
+ <:loaded as |loader|>
{{#let
(hash
@@ -54,12 +53,12 @@ as |route|>
-
+ <:header>
-
-
+
+ <:actions>
{{#if (can "create roles")}}
data-test-create
/>
{{/if}}
-
-
+
+ <:toolbar>
{{#if (gt items.length 0) }}
@filter={{filters}}
/>
{{/if}}
-
-
+
+ <:content>
-
+ <:header>
{{t 'routes.dc.acls.roles.index.empty.header'
items=items.length
}}
-
-
+
+ <:body>
{{t 'routes.dc.acls.roles.index.empty.body'
items=items.length
htmlSafe=true
}}
-
-
+
+ <:actions>
-
@size='small'
/>
-
+
-
+
{{/let}}
-
+
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/templates/dc/acls/tokens/edit.hbs b/ui/packages/consul-ui/app/templates/dc/acls/tokens/edit.hbs
index c03c290ee9f..fd5f1cee72e 100644
--- a/ui/packages/consul-ui/app/templates/dc/acls/tokens/edit.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/acls/tokens/edit.hbs
@@ -14,10 +14,9 @@ as |route|>
dc=route.params.dc
id=(or route.params.id '')
)
- }}
- as |loader|>
+ }}>
-
+ <:error as |loader|>
{{#if (eq loader.error.status '401')}}
{{else}}
@@ -26,9 +25,9 @@ as |route|>
@login={{route.model.app.login.open}}
/>
{{/if}}
-
+
-
+ <:loaded as |loader|>
{{#let
route.params.dc
@@ -41,12 +40,12 @@ as |dc partition nspace item create|}}
-
+ <:breadcrumbs>
-
-
+
+ <:header>
{{#if create}}
@@ -54,21 +53,21 @@ as |dc partition nspace item create|}}
{{/if}}
-
-
+
+ <:actions>
{{#if (not create)}}
{{#if (not-eq item.AccessorID this.token.AccessorID)}}
-
+ <:action as |confirm|>
-
-
+
+ <:dialog as |execute cancel message|>
{{message}}
@@ -85,7 +84,7 @@ as |dc partition nspace item create|}}
{{action cancel}}
/>
-
+
{{/if}}
{{#if (can "duplicate token" item=item)}}
@@ -98,8 +97,8 @@ as |dc partition nspace item create|}}
{{/if}}
{{/if}}
-
-
+
+ <:content>
{{#if (token/is-legacy item)}}
Update
@@ -154,9 +153,9 @@ as |dc partition nspace item create|}}
@onDelete={{fn this.onDelete item}}
@onChange={{action 'change'}}
/>
-
+
{{/let}}
-
+
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/templates/dc/acls/tokens/index.hbs b/ui/packages/consul-ui/app/templates/dc/acls/tokens/index.hbs
index b87d82cbe07..7529bcd1500 100644
--- a/ui/packages/consul-ui/app/templates/dc/acls/tokens/index.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/acls/tokens/index.hbs
@@ -13,10 +13,9 @@ as |route|>
partition=route.params.partition
nspace=route.params.nspace
dc=route.params.dc
- )}}
- as |loader|>
+ )}}>
-
+ <:error as |loader|>
{{#if (eq loader.error.status '401')}}
{{else}}
@@ -25,9 +24,9 @@ as |route|>
@login={{route.model.app.login.open}}
/>
{{/if}}
-
+
-
+ <:loaded as |loader|>
{{#let
(hash
@@ -57,12 +56,12 @@ as |route|>
-
+ <:header>
-
-
+
+ <:actions>
{{#if (can "create tokens")}}
data-test-create
/>
{{/if}}
-
-
+
+ <:toolbar>
{{#if (gt items.length 0)}}
@filter={{filters}}
/>
{{/if}}
-
-
+
+ <:content>
{{#if (token/is-legacy items)}}
Update
@@ -115,25 +114,25 @@ as |route|>
-
+ <:header>
{{t 'routes.dc.acls.tokens.index.empty.header'
items=items.length
}}
-
-
+
+ <:body>
{{t 'routes.dc.acls.tokens.index.empty.body'
items=items.length
htmlSafe=true
}}
-
+
-
+
{{/let}}
-
+
diff --git a/ui/packages/consul-ui/app/templates/dc/intentions/edit.hbs b/ui/packages/consul-ui/app/templates/dc/intentions/edit.hbs
index 049dd7917b5..251a660dbd6 100644
--- a/ui/packages/consul-ui/app/templates/dc/intentions/edit.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/intentions/edit.hbs
@@ -14,28 +14,27 @@ as |route|>
dc=route.params.dc
id=(or route.params.intention_id '')
)
- }}
- as |loader|>
+ }}>
-
+ <:error as |loader|>
-
+
-
+ <:loaded as |loader|>
{{#let
loader.data
(not (can "write intention" item=loader.data))
as |item readOnly|}}
-
+ <:breadcrumbs>
-
-
+
+ <:header>
{{#if (not readOnly)}}
{{#if item.ID}}
@@ -47,8 +46,8 @@ as |item readOnly|}}
{{/if}}
-
-
+
+ <:content>
-
+
{{/let}}
-
+
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/templates/dc/intentions/index.hbs b/ui/packages/consul-ui/app/templates/dc/intentions/index.hbs
index 2cb37cc4aea..2fca27cf19a 100644
--- a/ui/packages/consul-ui/app/templates/dc/intentions/index.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/intentions/index.hbs
@@ -13,17 +13,16 @@ as |route|>
partition=route.params.partition
nspace=route.params.nspace
dc=route.params.dc
- )}}
- as |api|>
+ )}}>
-
+ <:error as |api|>
-
+
-
+ <:loaded as |api|>
{{#let
(hash
@@ -51,13 +50,13 @@ as |route|>
as |sort filters items|}}
-
+ <:header>
{{format-number items.length}} total
-
-
+
+ <:actions>
{{#if (can 'create intentions')}}
data-test-create
/>
{{/if}}
-
-
+
+ <:toolbar>
{{#if (gt items.length 0) }}
/>
{{/if}}
-
-
+
+ <:content>
{{#let (refresh-route) as |refreshRoute|}}
}}
@type="intention"
@ondelete={{refreshRoute}}
- @onchange={{refreshRoute}}
- as |writer|>
-
+ @onchange={{refreshRoute}}>
+ <:content as |writer|>
-
+ <:header>
{{t 'routes.dc.intentions.index.empty.header'
items=items.length
}}
-
-
+
+ <:body>
{{t 'routes.dc.intentions.index.empty.body'
items=items.length
canUseACLs=(can "use acls")
htmlSafe=true
}}
-
-
+
+ <:actions>
-
@size='small'
/>
-
+
-
+
{{/let}}
-
+
{{/let}}
-
+
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/templates/dc/kv/edit.hbs b/ui/packages/consul-ui/app/templates/dc/kv/edit.hbs
index 52caf4506df..7ec668d8309 100644
--- a/ui/packages/consul-ui/app/templates/dc/kv/edit.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/kv/edit.hbs
@@ -23,17 +23,16 @@ as |parentKey|}}
dc=route.params.dc
key=(if (string-ends-with this.routeName 'create') '' route.params.key)
)
- }}
- as |loader|>
+ }}>
-
+ <:error as |loader|>
-
+
-
+ <:loaded as |loader|>
{{#let
route.params.dc
@@ -45,7 +44,7 @@ as |dc partition nspace item|}}
-
+ <:breadcrumbs>
{{#if (not-eq parentKey separator)}}
@@ -74,9 +73,9 @@ as |parts|}}
{{/if}}
-
+
-
+ <:header>
{{#if (and item.Key (not-eq item.Key parentKey))}}
@@ -85,9 +84,9 @@ as |parts|}}
{{/if}}
-
+
-
+ <:content>
{{! if a KV has a session `Session` will always be populated despite any specific session permissions }}
{{#if item.Session}}
@@ -136,10 +135,10 @@ as |parts|}}
{{/if}}
{{/if}}
-
+
{{/let}}
-
+
{{/let}}
{{/let}}
diff --git a/ui/packages/consul-ui/app/templates/dc/kv/index.hbs b/ui/packages/consul-ui/app/templates/dc/kv/index.hbs
index 7042b62f1c0..137fd9a1f8b 100644
--- a/ui/packages/consul-ui/app/templates/dc/kv/index.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/kv/index.hbs
@@ -24,16 +24,15 @@ as |route|>
nspace=route.params.nspace
dc=route.params.dc
key=(or route.params.key '/')
- )}}
- as |loader|>
+ )}}>
-
+ <:error as |loader|>
-
-
+
+ <:disconnected as |loader after|>
{{#if (eq loader.error.status "404")}}
{{/if}}
-
+
-
+ <:loaded as |loader|>
{{#let
(hash
@@ -86,18 +85,16 @@ as |route|>
loader.data
as |sort filters parent items|}}
-
- {{#if (not-eq parent.Key '/') }}
-
+
+ <:breadcrumbs>
{{#each (slice 0 -2 (split parent.Key '/')) as |breadcrumb index|}}
{{/each}}
-
- {{/if}}
-
+
+ <:header>
{{#if (eq parent.Key '/')}}
@@ -106,8 +103,8 @@ as |sort filters parent items|}}
{{/if}}
-
-
+
+ <:toolbar>
{{#if (gt items.length 0) }}
{{/if}}
-
-
+
+ <:actions>
{{#if (can 'create kvs')}}
{{#if (and parent.Key (not-eq parent.Key '/')) }}
{{/if}}
{{/if}}
-
-
+
+ <:content>
{{#let (refresh-route) as |refreshRoute|}}
-
+ @ondelete={{refreshRoute}}>
+ <:content as |writer|>
-
+ <:header>
{{t 'routes.dc.kv.index.empty.header'
items=items.length
}}
-
-
+
+ <:body>
{{t 'routes.dc.kv.index.empty.body'
items=items.length
canUseACLs=(can "use acls")
htmlSafe=true
}}
-
-
+
+ <:actions>
-
-
+
-
+
{{/let}}
-
+
{{/let}}
-
+
diff --git a/ui/packages/consul-ui/app/templates/dc/nodes/index.hbs b/ui/packages/consul-ui/app/templates/dc/nodes/index.hbs
index 39e2ddb2755..2ca432879a1 100644
--- a/ui/packages/consul-ui/app/templates/dc/nodes/index.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/nodes/index.hbs
@@ -18,14 +18,13 @@
'/${partition}/${nspace}/${dc}/nodes'
(hash partition=route.params.partition nspace=route.params.nspace dc=route.params.dc)
}}
- as |api|
>
-
+ <:error as |api|>
-
+
-
+ <:loaded as |api|>
{{#let
(hash value=(or this.sortBy 'Status:asc') change=(action (mut this.sortBy) value='target.selected'))
(hash
@@ -52,14 +51,14 @@
}}
{{#let (reject-by 'Meta.synthetic-node' items) as |filtered|}}
-
+ <:header>
{{format-number items.length}} total
-
-
+
+ <:toolbar>
{{#if (gt filtered.length 0)}}
{{/if}}
-
-
+
+ <:content>
-
+ <:header>
{{t 'routes.dc.nodes.index.empty.header' items=items.length}}
-
-
+
+ <:body>
{{t
'routes.dc.nodes.index.empty.body'
items=items.length
canUseACLs=(can 'use acls')
htmlSafe=true
}}
-
-
+
+ <:actions>
-
-
+
-
+
{{/let}}
{{/let}}
-
+
diff --git a/ui/packages/consul-ui/app/templates/dc/nodes/show.hbs b/ui/packages/consul-ui/app/templates/dc/nodes/show.hbs
index 1221750d4a9..e05a3413444 100644
--- a/ui/packages/consul-ui/app/templates/dc/nodes/show.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/nodes/show.hbs
@@ -23,16 +23,15 @@ as |route|>
name=route.params.name
peer=route.params.peer
)
- }}
- as |loader|>
-
+ }}>
+ <:error as |loader|>
-
+
-
+ <:disconnected as |loader after|>
{{#if (eq loader.error.status "404")}}
An error was returned whilst loading this data, refresh to try again.
{{/if}}
-
-
+
+ <:loaded as |loader|>
{{#let
loader.data
tomography.data
as |item tomography|}}
-
+ <:notification as |status type|>
-
-
-
+
+ <:breadcrumbs>
+
-
-
+
+ <:header>
-
-
+
+ <:nav>
-
-
+
+ <:actions>
{{format-ipaddr item.Address}}
-
-
+
+ <:content>
{{outlet}}
-
+
{{/let}}
-
+
diff --git a/ui/packages/consul-ui/app/templates/dc/nodes/show/healthchecks.hbs b/ui/packages/consul-ui/app/templates/dc/nodes/show/healthchecks.hbs
index 4b4537a4719..3898a23a1dd 100644
--- a/ui/packages/consul-ui/app/templates/dc/nodes/show/healthchecks.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/nodes/show/healthchecks.hbs
@@ -74,12 +74,12 @@ as |route|>
-
+ <:body>
{{t "routes.dc.nodes.show.healthchecks.empty"
items=items.length
htmlSafe=true
}}
-
+
diff --git a/ui/packages/consul-ui/app/templates/dc/nodes/show/metadata.hbs b/ui/packages/consul-ui/app/templates/dc/nodes/show/metadata.hbs
index 06ebf4cb42f..fce99619b03 100644
--- a/ui/packages/consul-ui/app/templates/dc/nodes/show/metadata.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/nodes/show/metadata.hbs
@@ -11,11 +11,11 @@ as |route|>
{{else}}
-
+ <:body>
This node has no metadata.
-
+
{{/if}}
diff --git a/ui/packages/consul-ui/app/templates/dc/nodes/show/services.hbs b/ui/packages/consul-ui/app/templates/dc/nodes/show/services.hbs
index e491fd67fa2..48629b635d5 100644
--- a/ui/packages/consul-ui/app/templates/dc/nodes/show/services.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/nodes/show/services.hbs
@@ -69,12 +69,12 @@ as |route|>
-
+ <:body>
{{t "routes.dc.nodes.show.services.empty"
items=items.length
htmlSafe=true
}}
-
+
diff --git a/ui/packages/consul-ui/app/templates/dc/nodes/show/sessions.hbs b/ui/packages/consul-ui/app/templates/dc/nodes/show/sessions.hbs
index 9785d7f350f..63dc83ceb43 100644
--- a/ui/packages/consul-ui/app/templates/dc/nodes/show/sessions.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/nodes/show/sessions.hbs
@@ -13,16 +13,16 @@ as |route|>
dc=route.params.dc
node=route.params.name
)
- }} as |api|>
+ }}>
-
+ <:error as |api|>
-
+
-
+ <:loaded as |api|>
{{#let api.data (refresh-route) as |items refreshRoute|}}
}}
@type="session"
@label="Lock Session"
- @ondelete={{refreshRoute}}
- as |writer|>
+ @ondelete={{refreshRoute}}>
-
+ <:removed as |after|>
-
+
-
+ <:error as |after error writer |>
@type="remove"
@error={{error}}
/>
-
+
-
+ <:content as |writer|>
-
+ <:header>
{{t 'routes.dc.nodes.show.sessions.empty.header'
items=items.length
}}
-
-
+
+ <:body>
{{t 'routes.dc.nodes.show.sessions.empty.body'
canUseACLs=(can "use acls")
htmlSafe=true
}}
-
+
-
+ <:actions>
-
@size='small'
/>
-
+
-
+
{{/let}}
-
+
diff --git a/ui/packages/consul-ui/app/templates/dc/nspaces/edit.hbs b/ui/packages/consul-ui/app/templates/dc/nspaces/edit.hbs
index 138554645f2..051e9c4176d 100644
--- a/ui/packages/consul-ui/app/templates/dc/nspaces/edit.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/nspaces/edit.hbs
@@ -14,17 +14,16 @@ as |route|>
dc=route.params.dc
id=(or route.params.name '')
)
- }}
- as |loader|>
+ }}>
-
+ <:error as |loader|>
-
+
-
+ <:loaded as |loader|>
{{#let
route.params.dc
@@ -35,19 +34,19 @@ as |route|>
loader.data.isNew
as |dc partition nspace item create|}}
-
+ <:breadcrumbs>
-
-
+
+ <:header>
-
-
-
-
+
+ <:actions>
+
+ <:content>
-
+
{{/let}}
-
+
diff --git a/ui/packages/consul-ui/app/templates/dc/nspaces/index.hbs b/ui/packages/consul-ui/app/templates/dc/nspaces/index.hbs
index 6916079afb5..e88a4a0f915 100644
--- a/ui/packages/consul-ui/app/templates/dc/nspaces/index.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/nspaces/index.hbs
@@ -13,17 +13,16 @@ as |route|>
partition=route.params.partition
nspace=route.params.nspace
dc=route.params.dc
- )}}
- as |loader|>
+ )}}>
-
+ <:error as |loader|>
-
+
-
+ <:loaded as |loader|>
{{#let
(hash
@@ -47,12 +46,12 @@ as |route|>
as |sort filters items|}}
-
+ <:header>
-
-
+
+ <:actions>
{{#if (can "create nspaces")}}
data-test-create
/>
{{/if}}
-
-
+
+ <:toolbar>
{{#if (gt items.length 0)}}
@filter={{filters}}
/>
{{/if}}
-
-
+
+ <:content>
{{#let (refresh-route) as |refreshRoute|}}
}}
@type="nspace"
@label="Namespace"
- @ondelete={{refreshRoute}}
- as |writer|>
-
-
+ <:removed as |after|>
+
-
-
+
+ <:content as |writer|>
-
+ <:header>
{{t 'routes.dc.namespaces.index.empty.header'
items=items.length}}
-
-
+
+ <:body>
{{t 'routes.dc.namespaces.index.empty.body'
items=items.length
canUseACLs=(can 'use acls')}}
-
-
+
+ <:actions>
-
@size='small'
/>
-
+
-
+
{{/let}}
-
+
{{/let}}
-
+
diff --git a/ui/packages/consul-ui/app/templates/dc/partitions/edit.hbs b/ui/packages/consul-ui/app/templates/dc/partitions/edit.hbs
index d416450e7f4..66452fe1e21 100644
--- a/ui/packages/consul-ui/app/templates/dc/partitions/edit.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/partitions/edit.hbs
@@ -14,17 +14,16 @@ as |route|>
dc=route.params.dc
id=(or route.params.name '')
)
- }}
- as |loader|>
+ }}>
-
+ <:error as |loader|>
-
+
-
+ <:loaded as |loader|>
{{#let
route.params.dc
@@ -34,23 +33,23 @@ as |route|>
loader.data
as |dc partition nspace item|}}
-
+ <:breadcrumbs>
-
-
+
+ <:header>
-
-
+
+ <:content>
-
+
{{/let}}
-
+
diff --git a/ui/packages/consul-ui/app/templates/dc/partitions/index.hbs b/ui/packages/consul-ui/app/templates/dc/partitions/index.hbs
index 2bb8ebc5a37..960813fbca4 100644
--- a/ui/packages/consul-ui/app/templates/dc/partitions/index.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/partitions/index.hbs
@@ -13,17 +13,16 @@ as |route|>
partition=route.params.partition
nspace=route.params.nspace
dc=route.params.dc
- )}}
- as |loader|>
+ )}}>
-
+ <:error as |loader|>
-
+
-
+ <:loaded as |loader|>
{{#let
(hash
@@ -47,12 +46,12 @@ as |route|>
as |sort filters items|}}
-
+ <:header>
-
-
+
+ <:actions>
{{#if (can 'create partitions')}}
data-test-create
/>
{{/if}}
-
-
+
+ <:toolbar>
{{#if (gt items.length 0)}}
@filter={{filters}}
/>
{{/if}}
-
-
+
+ <:content>
{{#let (refresh-route) as |refreshRoute|}}
}}
@type="partition"
@label="Partition"
- @ondelete={{refreshRoute}}
- as |writer|>
-
+ @ondelete={{refreshRoute}}>
+ <:removed as |writer after|>
-
-
+
+ <:content as |writer|>
-
+ <:header>
{{t 'routes.dc.partitions.index.empty.header'
items=items.length}}
-
-
+
+ <:body>
{{t 'routes.dc.partitions.index.empty.body'
items=items.length
canUseACLs=(can 'use acls')}}
-
-
+
+ <:actions>
-
Documentation on Admin Partitions
-
+
-
+
{{/let}}
-
+
{{/let}}
-
+
diff --git a/ui/packages/consul-ui/app/templates/dc/peers/index.hbs b/ui/packages/consul-ui/app/templates/dc/peers/index.hbs
index b4f4d7724d8..cc9bd0ef54c 100644
--- a/ui/packages/consul-ui/app/templates/dc/peers/index.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/peers/index.hbs
@@ -13,14 +13,13 @@
dc=route.params.dc
)
}}
- as |loader|
>
-
+ <:error as |loader|>
-
+
-
+ <:loaded as |loader|>
{{#let
(hash
value=(or this.sortBy "State:asc")
@@ -45,12 +44,12 @@
as |sort filters items|
}}
-
+ <:header>
-
-
+
+ <:toolbar>
{{#if (gt items.length 0)}}
{{/if}}
-
-
+
+ <:actions>
-
- {{did-insert-helper (set this "create" modal)}}
+ <:header as |api|>
+ {{did-insert-helper (set this "create" api)}}
Add peer connection
-
-
+
+ <:body as |api|>
- {{#if modal.opened}}
+ {{#if api.opened}}
{{did-insert-helper (set this "form" form)}}
@@ -90,10 +88,10 @@
{{/if}}
-
-
+
+ <:actions>
-
+
-
-
+
+ <:content>
-
+ <:removed as |after|>
-
-
+
+ <:content as |writer|>
-
+ <:header as |modal|>
{{did-insert-helper (set this "regenerate" modal)}}
Regenerate token
-
-
+
+ <:body>
{{#if this.item}}
{{/if}}
-
-
+
+ <:actions>
-
+
{{! TODO: do we need to check permissions here or will we receive an error automatically? }}
-
+ <:header>
{{t
"routes.dc.peers.index.empty.header"
items=items.length
}}
-
-
+
+ <:body>
{{t
"routes.dc.peers.index.empty.body"
@@ -196,8 +192,8 @@
htmlSafe=true
}}
-
-
+
+ <:actions>
-
{{! what's the docs for peering?}}
-
+
-
+
-
+
{{/let}}
-
+
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/templates/dc/peers/show.hbs b/ui/packages/consul-ui/app/templates/dc/peers/show.hbs
index 5ad3f5fea97..45f9eb0f37e 100644
--- a/ui/packages/consul-ui/app/templates/dc/peers/show.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/peers/show.hbs
@@ -14,14 +14,13 @@
name=route.params.name
)
}}
- as |loader|
>
-
+ <:error as |loader|>
-
+
-
+ <:loaded as |loader|>
{{#let
route.params.dc
route.params.partition
@@ -30,17 +29,17 @@
as |dc partition nspace item|
}}
-
+ <:breadcrumbs>
-
-
+
+ <:header>
-
-
+
+ <:content>
@@ -56,9 +55,9 @@
>
{{outlet}}
-
+
{{/let}}
-
+
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/templates/dc/peers/show/addresses.hbs b/ui/packages/consul-ui/app/templates/dc/peers/show/addresses.hbs
index fdd823c0f13..90e93027464 100644
--- a/ui/packages/consul-ui/app/templates/dc/peers/show/addresses.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/peers/show/addresses.hbs
@@ -8,15 +8,15 @@
{{else}}
-
+ <:header>
{{t "routes.dc.peers.show.addresses.empty.header"}}
-
-
+
+ <:body>
{{t "routes.dc.peers.show.addresses.empty.body" htmlSafe=true}}
-
-
+
+ <:actions>
-
-
+
{{/if}}
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/templates/dc/peers/show/exported.hbs b/ui/packages/consul-ui/app/templates/dc/peers/show/exported.hbs
index 09b8118c993..5526d3d48f8 100644
--- a/ui/packages/consul-ui/app/templates/dc/peers/show/exported.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/peers/show/exported.hbs
@@ -14,19 +14,17 @@
name=route.model.peer.Name
)
}}
- as |api|
>
- {{#let
- (or route.params.partition route.model.user.token.Partition "default")
- api.data
- as |partition items|
- }}
-
-
-
-
+ <:error as |api|>
+
+
-
+ <:loaded as |api|>
+ {{#let
+ (or route.params.partition route.model.user.token.Partition "default")
+ api.data
+ as |partition items|
+ }}
{{#if items.length}}
@@ -134,8 +132,8 @@
-
- {{/let}}
+ {{/let}}
+
-
\ No newline at end of file
+
diff --git a/ui/packages/consul-ui/app/templates/dc/peers/show/imported.hbs b/ui/packages/consul-ui/app/templates/dc/peers/show/imported.hbs
index 844d8908a60..5ed16df01db 100644
--- a/ui/packages/consul-ui/app/templates/dc/peers/show/imported.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/peers/show/imported.hbs
@@ -15,14 +15,13 @@
peerId=route.model.peer.id
)
}}
- as |api|
>
-
+ <:error as |api|>
-
+
-
+ <:loaded as |api|>
{{#let
(hash
value=(or this.sortBy "Status:asc")
@@ -92,23 +91,23 @@
@login={{route.model.app.login.open}}
data-test-imported-services-empty
>
-
+ <:header>
{{t
"routes.dc.peers.show.imported.empty.header"
name=route.model.peer.Name
}}
-
-
+
+ <:body>
{{t
"routes.dc.peers.show.imported.empty.body"
items=items.length
name=route.model.peer.Name
htmlSafe=true
}}
-
-
+
+ <:actions>
-
{{! what's the docs for peering?}}
-
+
{{/let}}
-
+
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/templates/dc/routing-config.hbs b/ui/packages/consul-ui/app/templates/dc/routing-config.hbs
index 4e955bba6b0..ced2b8ef53e 100644
--- a/ui/packages/consul-ui/app/templates/dc/routing-config.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/routing-config.hbs
@@ -15,41 +15,40 @@ as |route|>
dc=route.params.dc
name=route.params.name
)
- }}
- as |loader|>
+ }}>
-
+ <:error as |loader|>
-
+
-
+ <:loaded as |loader|>
{{#let
loader.data
as |item|}}
-
+ <:breadcrumbs>
-
-
+
+ <:header>
-
-
+
+ <:content>
-
+
{{/let}}
-
+
diff --git a/ui/packages/consul-ui/app/templates/dc/services/index.hbs b/ui/packages/consul-ui/app/templates/dc/services/index.hbs
index c6101f48194..d738b93eecd 100644
--- a/ui/packages/consul-ui/app/templates/dc/services/index.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/services/index.hbs
@@ -14,16 +14,16 @@ as |route|>
nspace=route.params.nspace
dc=route.params.dc
)
- }} as |api|>
+ }}>
-
+ <:error as |api|>
-
+
-
+ <:loaded as |api|>
{{#let
@@ -64,13 +64,13 @@ as |route|>
as |sort filters items partition nspace|}}
-
+ <:header>
{{format-number items.length}} total
-
-
+
+ <:toolbar>
{{#if (gt items.length 0) }}
{{#let (collection items) as |items|}}
{{/let}}
{{/if}}
-
-
+
+ <:content>
-
+ <:header>
{{t 'routes.dc.services.index.empty.header'
items=items.length
}}
-
-
+
+ <:body>
{{t 'routes.dc.services.index.empty.body'
items=items.length
canUseACLs=(can "use acls")
htmlSafe=true
}}
-
-
+
+ <:actions>
-
-
+
-
+
{{/let}}
-
+
diff --git a/ui/packages/consul-ui/app/templates/dc/services/instance.hbs b/ui/packages/consul-ui/app/templates/dc/services/instance.hbs
index eb46bd4834f..0c054f59ece 100644
--- a/ui/packages/consul-ui/app/templates/dc/services/instance.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/services/instance.hbs
@@ -17,14 +17,13 @@
peer=route.params.peer
)
}}
- as |loader|
>
-
+ <:error as |loader|>
-
+
-
+ <:disconnected as |loader after|>
{{#if (eq loader.error.status '404')}}
{{/if}}
-
+
-
+ <:loaded as |loader|>
{{#let loader.data as |item|}}
{{#if item.IsOrigin}}
{{/if}}
-
+ <:breadcrumbs>
-
-
+
+ <:header>
@@ -123,8 +122,8 @@
{{#if (eq this.meta.ServiceProxy.Mode 'transparent')}}
{{/if}}
-
-
+
+ <:nav>
- Service Name
- {{item.Service.PeerName}}
{{/if}}
-
-
+
+ <:actions>
{{#let (or item.Service.Address item.Node.Address) as |address|}}
{{format-ipaddr address}}
{{/let}}
-
-
+
+ <:content>
{{outlet}}
-
+
{{/let}}
-
+
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/templates/dc/services/instance/addresses.hbs b/ui/packages/consul-ui/app/templates/dc/services/instance/addresses.hbs
index f570d97fb1d..384abbd5172 100644
--- a/ui/packages/consul-ui/app/templates/dc/services/instance/addresses.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/services/instance/addresses.hbs
@@ -14,13 +14,13 @@ as |items|}}
-
+ <:header>
Tag |
Address |
-
-
+
+ <:row as |taggedAddress index|>
{{#let (object-at 1 taggedAddress) as |address|}}
{{object-at 0 taggedAddress}}{{#if (and (eq address.Address route.model.item.Address) (eq address.Port route.model.item.Port))}} (default){{/if}}
@@ -29,7 +29,7 @@ as |items|}}
{{address.Address}}:{{address.Port}}
|
{{/let}}
-
+
{{else}}
diff --git a/ui/packages/consul-ui/app/templates/dc/services/instance/exposedpaths.hbs b/ui/packages/consul-ui/app/templates/dc/services/instance/exposedpaths.hbs
index 0442c6833d5..40e698a890c 100644
--- a/ui/packages/consul-ui/app/templates/dc/services/instance/exposedpaths.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/services/instance/exposedpaths.hbs
@@ -19,9 +19,9 @@ as |item proxy|}}
/>
{{else}}
-
+ <:body>
{{t 'routes.dc.services.instance.exposedpaths.empty.body' htmlSafe=true}}
-
+
{{/if}}
diff --git a/ui/packages/consul-ui/app/templates/dc/services/instance/healthchecks.hbs b/ui/packages/consul-ui/app/templates/dc/services/instance/healthchecks.hbs
index adbb3794a87..ffd6aea847e 100644
--- a/ui/packages/consul-ui/app/templates/dc/services/instance/healthchecks.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/services/instance/healthchecks.hbs
@@ -72,13 +72,13 @@
-
+ <:body>
{{t
'routes.dc.services.instance.healthchecks.empty'
items=items.length
htmlSafe=true
}}
-
+
diff --git a/ui/packages/consul-ui/app/templates/dc/services/instance/metadata.hbs b/ui/packages/consul-ui/app/templates/dc/services/instance/metadata.hbs
index 5635d2bf97e..69bb0468087 100644
--- a/ui/packages/consul-ui/app/templates/dc/services/instance/metadata.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/services/instance/metadata.hbs
@@ -16,11 +16,11 @@ as |item|}}
{{else}}
-
+ <:body>
There are no tags.
-
+
{{/if}}
@@ -30,11 +30,11 @@ as |item|}}
{{else}}
-
+ <:body>
This instance has no metadata.
-
+
{{/if}}
diff --git a/ui/packages/consul-ui/app/templates/dc/services/instance/upstreams.hbs b/ui/packages/consul-ui/app/templates/dc/services/instance/upstreams.hbs
index 2a49fa17ac7..138324c5472 100644
--- a/ui/packages/consul-ui/app/templates/dc/services/instance/upstreams.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/services/instance/upstreams.hbs
@@ -80,12 +80,12 @@ as |route|>
-
+ <:body>
{{t "routes.dc.services.instance.upstreams.empty"
items=items.length
htmlSafe=true
}}
-
+
diff --git a/ui/packages/consul-ui/app/templates/dc/services/show.hbs b/ui/packages/consul-ui/app/templates/dc/services/show.hbs
index c49ca31d19a..da817f13024 100644
--- a/ui/packages/consul-ui/app/templates/dc/services/show.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/services/show.hbs
@@ -15,17 +15,16 @@ as |route|>
name=route.params.name
peer=route.params.peer
)
- }}
- as |loader|>
+ }}>
-
+ <:error as |loader|>
-
+
-
+ <:disconnected as |loader after|>
{{#if (eq loader.error.status "404")}}
An error was returned whilst loading this data, refresh to try again.
{{/if}}
-
+
-
+ <:loaded as |loader|>
{{#let
loader.data
(get loader.data "firstObject")
@@ -107,14 +106,14 @@ as |items item dc|}}
)
as |tabs|}}
-
+ <:notification as |status type item error|>
-
-
+
+ <:breadcrumbs>
-
-
+
+ <:header>
-
-
+
+ <:nav>
{{#if (not-eq item.Service.Kind 'mesh-gateway')}}
{{/if}}
-
-
+
+ <:actions>
{{/if}}
-
-
+
+ <: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) this.chain)}}
@@ -210,10 +209,10 @@ as |items item dc|}}
{{outlet}}
{{/if}}
-
+
{{/let}}
{{/let}}
-
+
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/templates/dc/services/show/instances.hbs b/ui/packages/consul-ui/app/templates/dc/services/show/instances.hbs
index e782e37c680..a8401cf48bd 100644
--- a/ui/packages/consul-ui/app/templates/dc/services/show/instances.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/services/show/instances.hbs
@@ -81,12 +81,12 @@ as |sort filters items proxyMeta|}}
-
+ <:body>
{{t "routes.dc.services.show.instances.empty"
items=items.length
htmlSafe=true
}}
-
+
diff --git a/ui/packages/consul-ui/app/templates/dc/services/show/intentions/edit.hbs b/ui/packages/consul-ui/app/templates/dc/services/show/intentions/edit.hbs
index 2f56a8d8035..5f2eb4c661f 100644
--- a/ui/packages/consul-ui/app/templates/dc/services/show/intentions/edit.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/services/show/intentions/edit.hbs
@@ -17,17 +17,16 @@ as |readOnly|}}
dc=route.params.dc
id=(or route.params.intention_id '')
)
- }}
- as |loader|>
+ }}>
-
+ <:error as |loader|>
-
+
-
+ <:loaded as |loader|>
{{#let
loader.data
as |item|}}
@@ -43,7 +42,7 @@ as |item|}}
@onsubmit={{transition-to 'dc.services.show.intentions.index'}}
/>
{{/let}}
-
+
{{/let}}
diff --git a/ui/packages/consul-ui/app/templates/dc/services/show/intentions/index.hbs b/ui/packages/consul-ui/app/templates/dc/services/show/intentions/index.hbs
index 0a4847a6fc1..bf38f4b42e9 100644
--- a/ui/packages/consul-ui/app/templates/dc/services/show/intentions/index.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/services/show/intentions/index.hbs
@@ -14,12 +14,11 @@ as |route|>
dc=route.params.dc
slug=route.params.name
)
- }}
- as |api|>
-
+ }}>
+ <:error as |api|>
-
-
+
+ <:loaded as |api|>
{{#let
(hash
@@ -77,9 +76,8 @@ as |route|>
)
}}
@type="intention"
- @ondelete={{refreshRoute}}
- as |writer|>
-
+ @ondelete={{refreshRoute}}>
+ <:content as |writer|>
-
+ <:header>
{{t 'routes.dc.services.show.intentions.index.empty.header'
items=items.length
}}
-
-
+
+ <:body>
{{t 'routes.dc.services.show.intentions.index.empty.body'
items=items.length
canUseACLs=(can 'use acls')
htmlSafe=true
}}
-
-
+
+ <:actions>
@size='small'
/>
-
+
-
+
{{/let}}
{{/let}}
-
+
diff --git a/ui/packages/consul-ui/app/templates/dc/services/show/routing.hbs b/ui/packages/consul-ui/app/templates/dc/services/show/routing.hbs
index 60876c9024a..b81639ae28f 100644
--- a/ui/packages/consul-ui/app/templates/dc/services/show/routing.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/services/show/routing.hbs
@@ -14,21 +14,21 @@ as |route|>
dc=route.params.dc
name=route.params.name
)
- }} as |loader|>
+ }}>
-
+ <:error as |loader|>
-
+
-
+ <:loaded as |loader|>
-
+
diff --git a/ui/packages/consul-ui/app/templates/dc/services/show/services.hbs b/ui/packages/consul-ui/app/templates/dc/services/show/services.hbs
index 9cdf73a02e4..8aa44b8f3a0 100644
--- a/ui/packages/consul-ui/app/templates/dc/services/show/services.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/services/show/services.hbs
@@ -14,16 +14,16 @@ as |route|>
dc=route.params.dc
name=route.params.name
)
- }} as |loader|>
+ }}>
-
+ <:error as |loader|>
-
+
-
+ <:loaded as |loader|>
{{#let
@@ -81,17 +81,17 @@ as |route|>
-
+ <:body>
{{t "routes.dc.services.show.services.empty"
items=items.length
htmlSafe=true
}}
-
+
{{/let}}
-
+
diff --git a/ui/packages/consul-ui/app/templates/dc/services/show/tags.hbs b/ui/packages/consul-ui/app/templates/dc/services/show/tags.hbs
index adb0916be85..78fbe120225 100644
--- a/ui/packages/consul-ui/app/templates/dc/services/show/tags.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/services/show/tags.hbs
@@ -12,16 +12,16 @@ as |route|>
{{else}}
-
+ <:header>
{{t 'routes.dc.services.show.tags.empty.header'}}
-
-
+
+ <:body>
{{t 'routes.dc.services.show.tags.empty.body'
htmlSafe=true
}}
-
+
{{/if}}
{{/let}}
diff --git a/ui/packages/consul-ui/app/templates/dc/services/show/topology.hbs b/ui/packages/consul-ui/app/templates/dc/services/show/topology.hbs
index 01d7b8ee67e..7a8a45b8ba7 100644
--- a/ui/packages/consul-ui/app/templates/dc/services/show/topology.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/services/show/topology.hbs
@@ -15,16 +15,16 @@ as |route|>
name=route.params.name
kind=(or (get route.model.items "firstObject.Service.Kind") '')
)
- }} as |loader|>
+ }}>
-
+ <:error as |loader|>
-
+
-
+ <:loaded as |loader|>
{{#let
route.params.nspace
route.model.dc
@@ -179,6 +179,6 @@ as |nspace dc items topology|}}
{{/let}}
-
+
diff --git a/ui/packages/consul-ui/app/templates/dc/services/show/upstreams.hbs b/ui/packages/consul-ui/app/templates/dc/services/show/upstreams.hbs
index fc2c1e485d3..4c390b98de1 100644
--- a/ui/packages/consul-ui/app/templates/dc/services/show/upstreams.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/services/show/upstreams.hbs
@@ -14,16 +14,16 @@ as |route|>
dc=route.params.dc
name=route.params.name
)
- }} as |loader|>
+ }}>
-
+ <:error as |loader|>
-
+
-
+ <:loaded as |loader|>
{{#let
@@ -86,17 +86,17 @@ as |route|>
-
+ <:body>
{{t "routes.dc.services.show.upstreams.empty"
items=items.length
htmlSafe=true
}}
-
+
{{/let}}
-
+
diff --git a/ui/packages/consul-ui/app/templates/dc/show.hbs b/ui/packages/consul-ui/app/templates/dc/show.hbs
index de36dc16497..747f42cb275 100644
--- a/ui/packages/consul-ui/app/templates/dc/show.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/show.hbs
@@ -7,14 +7,14 @@
@name={{this.routeName}}
as |route|>
-
+ <:header>
-
-
-
-
+
+ <:toolbar>
+
+ <:nav>
{{#let
(from-entries (array
@@ -59,15 +59,15 @@ as |tabs|}}
{{/let}}
{{/let}}
-
-
+
+ <:content>
{{outlet}}
-
+
diff --git a/ui/packages/consul-ui/app/templates/dc/show/license.hbs b/ui/packages/consul-ui/app/templates/dc/show/license.hbs
index c6c7216bec3..7be256166fa 100644
--- a/ui/packages/consul-ui/app/templates/dc/show/license.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/show/license.hbs
@@ -14,20 +14,16 @@ as |route|>
nspace=route.params.nspace
dc=route.params.dc
)
- }}
- as |loader|>
+ }}>
-{{#let
- loader.data
-as |item|}}
-
+ <:error as |loader|>
-
+
-
+ <:disconnected as |after loader|>
{{#if (eq loader.error.status "404")}}
An error was returned whilst loading this data, refresh to try again.
{{/if}}
-
+
-
+ <:loaded as |loader|>
+{{#let
+ loader.data
+as |item|}}
-
{{/let}}
+
diff --git a/ui/packages/consul-ui/app/templates/dc/show/serverstatus.hbs b/ui/packages/consul-ui/app/templates/dc/show/serverstatus.hbs
index 5509aa008c7..d1836130ac5 100644
--- a/ui/packages/consul-ui/app/templates/dc/show/serverstatus.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/show/serverstatus.hbs
@@ -14,20 +14,16 @@ as |route|>
nspace=route.params.nspace
dc=route.params.dc
)
- }}
- as |loader|>
+ }}>
-{{#let
- loader.data
-as |item|}}
-
+ <:error as |loader|>
-
+
-
+ <:disconnected as |after loader|>
{{#if (eq loader.error.status "404")}}
An error was returned whilst loading this data, refresh to try again.
{{/if}}
-
+
-
+ <:loaded as |loader|>
+{{#let
+ loader.data
+as |item|}}
-
{{/let}}
+
diff --git a/ui/packages/consul-ui/app/templates/settings.hbs b/ui/packages/consul-ui/app/templates/settings.hbs
index ef1d9c2fd82..65bdcad9825 100644
--- a/ui/packages/consul-ui/app/templates/settings.hbs
+++ b/ui/packages/consul-ui/app/templates/settings.hbs
@@ -7,17 +7,16 @@
@name={{this.routeName}}
as |route|>
+ @src={{uri 'settings://consul:client'}}>
-
+ <:error as |loader|>
-
+
-
+ <:loaded as |loader|>
{{#let
(or loader.data (hash
blocking=true
@@ -25,12 +24,12 @@ as |route|>
)
as |item|}}
-
+ <:header>
-
-
+
+ <:content>
Local Storage
These settings are immediately saved to local storage and persisted through browser usage.
@@ -94,9 +93,9 @@ as |item|}}
{{/if}}
-
+
{{/let}}
-
+
diff --git a/ui/packages/consul-ui/docs/data-layer.mdx b/ui/packages/consul-ui/docs/data-layer.mdx
index 3a47d49123d..d00c8e6f804 100644
--- a/ui/packages/consul-ui/docs/data-layer.mdx
+++ b/ui/packages/consul-ui/docs/data-layer.mdx
@@ -95,9 +95,9 @@ The above method can be called from within the app, along with Blocking Query an
)
}}
as |loader|>
-
+ <:loaded>
Show the Auth Methods here {{loader.data}}
-
+
{{! or just }}
diff --git a/ui/packages/consul-ui/lib/block-slots/LICENSE.md b/ui/packages/consul-ui/lib/block-slots/LICENSE.md
deleted file mode 100644
index c75ad2a144c..00000000000
--- a/ui/packages/consul-ui/lib/block-slots/LICENSE.md
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2016 Ciena Corporation.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/ui/packages/consul-ui/lib/block-slots/README.md b/ui/packages/consul-ui/lib/block-slots/README.md
deleted file mode 100644
index 30b6bdb5416..00000000000
--- a/ui/packages/consul-ui/lib/block-slots/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# block-slots
-
-ember 3 compatible version of [ember-block-slots](https://github.com/ciena-blueplanet/ember-block-slots)
diff --git a/ui/packages/consul-ui/lib/block-slots/addon/components/block-slot.js b/ui/packages/consul-ui/lib/block-slots/addon/components/block-slot.js
deleted file mode 100644
index 0328d50c221..00000000000
--- a/ui/packages/consul-ui/lib/block-slots/addon/components/block-slot.js
+++ /dev/null
@@ -1,62 +0,0 @@
-import { readOnly } from '@ember/object/computed';
-import Component from '@ember/component';
-import { isPresent } from '@ember/utils';
-import { get, set, defineProperty, computed } from '@ember/object';
-import layout from '../templates/components/block-slot';
-import Slots from '../mixins/slots';
-import YieldSlot from './yield-slot';
-const BlockSlot = Component.extend({
- layout,
- tagName: '',
- _name: computed('name', {
- get() {
- return this.name;
- },
- set(_key, value) {
- return value;
- },
- }),
- didInsertElement: function (...args) {
- this._super(...args);
- const slottedComponent = this.nearestOfType(Slots);
- if (!slottedComponent._isRegistered(this._name)) {
- slottedComponent._activateSlot(this._name);
- set(this, 'slottedComponent', slottedComponent);
- return;
- }
- const yieldSlot = this.nearestOfType(YieldSlot);
- if (yieldSlot) {
- set(this, '_yieldSlot', yieldSlot);
- // The slotted component will yield multiple times - once to register
- // the activate slots and once more per active slot - only display this
- // block when its associated slot is the one yielding
- const isTargetSlotYielding = get(yieldSlot, '_name') === this._name;
- set(this, 'isTargetSlotYielding', isTargetSlotYielding);
-
- // If the associated slot has block params, create a computed property
- // for each block param. Technically this could be an unlimited, but
- // hbs lacks a spread operator so params are currently limited to 9
- // (see the yield in the block-slot template)
- //
- // Spread PR: https://github.com/wycats/handlebars.js/pull/1149
- const params = get(yieldSlot, '_blockParams');
- if (isTargetSlotYielding && isPresent(params)) {
- // p0 p1 p2...
- params.forEach((param, index) => {
- defineProperty(this, `p${index}`, readOnly(`_yieldSlot._blockParams.${index}`));
- });
- }
- }
- },
- willDestroyElement: function (...args) {
- this._super(...args);
- if (this.slottedComponent) {
- // Deactivate the yield slot using the slots interface when the block
- // is destroyed to allow the yield slot default {{else}} to take effect
- // dynamically
- this.slottedComponent._deactivateSlot(this._name);
- }
- },
-});
-
-export default BlockSlot;
diff --git a/ui/packages/consul-ui/lib/block-slots/addon/components/yield-slot.js b/ui/packages/consul-ui/lib/block-slots/addon/components/yield-slot.js
deleted file mode 100644
index 8733e315e7f..00000000000
--- a/ui/packages/consul-ui/lib/block-slots/addon/components/yield-slot.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import { computed, get } from '@ember/object';
-import { reads } from '@ember/object/computed';
-import Component from '@ember/component';
-import layout from '../templates/components/yield-slot';
-import Slots from '../mixins/slots';
-const YieldSlotComponent = Component.extend({
- layout,
- tagName: '',
- _name: reads('name'),
- _blockParams: reads('params'),
- _parentView: computed(function () {
- return this.nearestOfType(Slots);
- }),
- isActive: computed('_parentView._slots.[]', '_name', function () {
- return get(this, '_parentView._slots').includes(get(this, '_name'));
- }),
-});
-
-export default YieldSlotComponent;
diff --git a/ui/packages/consul-ui/lib/block-slots/addon/helpers/block-params.js b/ui/packages/consul-ui/lib/block-slots/addon/helpers/block-params.js
deleted file mode 100644
index b94431afc47..00000000000
--- a/ui/packages/consul-ui/lib/block-slots/addon/helpers/block-params.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import { A } from '@ember/array';
-import { helper } from '@ember/component/helper';
-export function blockParams(params) {
- return A(params.slice());
-}
-export default helper(blockParams);
diff --git a/ui/packages/consul-ui/lib/block-slots/addon/index.js b/ui/packages/consul-ui/lib/block-slots/addon/index.js
deleted file mode 100644
index 32df89ba8d4..00000000000
--- a/ui/packages/consul-ui/lib/block-slots/addon/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import SlotsMixin from './mixins/slots';
-
-export default SlotsMixin;
diff --git a/ui/packages/consul-ui/lib/block-slots/addon/mixins/slots.js b/ui/packages/consul-ui/lib/block-slots/addon/mixins/slots.js
deleted file mode 100644
index 3ed0273f134..00000000000
--- a/ui/packages/consul-ui/lib/block-slots/addon/mixins/slots.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import { computed, get } from '@ember/object';
-import { A } from '@ember/array';
-import Mixin from '@ember/object/mixin';
-export default Mixin.create({
- _slots: computed(function () {
- return A();
- }),
- _activateSlot(name) {
- get(this, '_slots').addObject(name);
- },
- _deactivateSlot(name) {
- get(this, '_slots').removeObject(name);
- },
- _isRegistered(name) {
- return get(this, '_slots').includes(name);
- },
-});
diff --git a/ui/packages/consul-ui/lib/block-slots/addon/templates/components/block-slot.hbs b/ui/packages/consul-ui/lib/block-slots/addon/templates/components/block-slot.hbs
deleted file mode 100644
index bd64b67eac8..00000000000
--- a/ui/packages/consul-ui/lib/block-slots/addon/templates/components/block-slot.hbs
+++ /dev/null
@@ -1,3 +0,0 @@
-{{#if this.isTargetSlotYielding}}
- {{yield this.p0 this.p1 this.p2 this.p3 this.p4 this.p5 this.p6 this.p7 this.p8 this.p9}}
-{{/if}}
\ No newline at end of file
diff --git a/ui/packages/consul-ui/lib/block-slots/addon/templates/components/yield-slot.hbs b/ui/packages/consul-ui/lib/block-slots/addon/templates/components/yield-slot.hbs
deleted file mode 100644
index 74f0a9d01e6..00000000000
--- a/ui/packages/consul-ui/lib/block-slots/addon/templates/components/yield-slot.hbs
+++ /dev/null
@@ -1,5 +0,0 @@
-{{#if this.isActive}}
- {{yield}}
-{{else}}
- {{yield to='inverse'}}
-{{/if}}
\ No newline at end of file
diff --git a/ui/packages/consul-ui/lib/block-slots/app/components/block-slot.js b/ui/packages/consul-ui/lib/block-slots/app/components/block-slot.js
deleted file mode 100644
index a21701d5d63..00000000000
--- a/ui/packages/consul-ui/lib/block-slots/app/components/block-slot.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from 'block-slots/components/block-slot';
diff --git a/ui/packages/consul-ui/lib/block-slots/app/components/yield-slot.js b/ui/packages/consul-ui/lib/block-slots/app/components/yield-slot.js
deleted file mode 100644
index fd21c3ee82e..00000000000
--- a/ui/packages/consul-ui/lib/block-slots/app/components/yield-slot.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from 'block-slots/components/yield-slot';
diff --git a/ui/packages/consul-ui/lib/block-slots/app/helpers/block-params.js b/ui/packages/consul-ui/lib/block-slots/app/helpers/block-params.js
deleted file mode 100644
index fdcda197829..00000000000
--- a/ui/packages/consul-ui/lib/block-slots/app/helpers/block-params.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from 'block-slots/helpers/block-params';
diff --git a/ui/packages/consul-ui/lib/block-slots/app/mixins/slots.js b/ui/packages/consul-ui/lib/block-slots/app/mixins/slots.js
deleted file mode 100644
index c5326a20321..00000000000
--- a/ui/packages/consul-ui/lib/block-slots/app/mixins/slots.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from 'block-slots/mixins/slots';
diff --git a/ui/packages/consul-ui/lib/block-slots/index.js b/ui/packages/consul-ui/lib/block-slots/index.js
deleted file mode 100644
index 2c132ac2707..00000000000
--- a/ui/packages/consul-ui/lib/block-slots/index.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/* eslint-env node */
-'use strict';
-
-module.exports = {
- name: require('./package').name,
-};
diff --git a/ui/packages/consul-ui/lib/block-slots/package.json b/ui/packages/consul-ui/lib/block-slots/package.json
deleted file mode 100644
index 02cfbd6a18c..00000000000
--- a/ui/packages/consul-ui/lib/block-slots/package.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "name": "block-slots",
- "dependencies": {
- "ember-cli-htmlbars": "*",
- "ember-cli-babel": "*"
- },
- "keywords": [
- "ember-addon"
- ]
-}
diff --git a/ui/packages/consul-ui/package.json b/ui/packages/consul-ui/package.json
index 891e53f3ba9..f69027694ba 100644
--- a/ui/packages/consul-ui/package.json
+++ b/ui/packages/consul-ui/package.json
@@ -207,7 +207,6 @@
},
"ember-addon": {
"paths": [
- "lib/block-slots",
"lib/colocated-components",
"lib/commands",
"lib/startup"
diff --git a/ui/packages/consul-ui/tests/integration/components/list-collection-test.js b/ui/packages/consul-ui/tests/integration/components/list-collection-test.js
index 87e7e5acd87..ee5805b0186 100644
--- a/ui/packages/consul-ui/tests/integration/components/list-collection-test.js
+++ b/ui/packages/consul-ui/tests/integration/components/list-collection-test.js
@@ -42,15 +42,15 @@ module('Integration | Component | list collection', function (hooks) {
document.body.appendChild(footer);
await render(hbs`
-
- {{item.name}}
-
+
+ <:header as |item|>{{item.name}}
+ <:actions as |item index Actions|>
- Action
+ <:label>Action
-
+
`);