diff --git a/ui-v2/app/routes/dc/acls/create.js b/ui-v2/app/routes/dc/acls/create.js
index 6cf035cb8821c1dac3fa51fb5cdf5241a8af6bf9..b164133448ed7b2572c64c9f41f15890c63c2548 100644
--- a/ui-v2/app/routes/dc/acls/create.js
+++ b/ui-v2/app/routes/dc/acls/create.js
@@ -18,7 +18,6 @@ export default Route.extend(WithAclActions, {
return hash({
routeName: this.routeName,
create: true,
- isLoading: false,
item: this.item,
types: ['management', 'client'],
});
diff --git a/ui-v2/app/routes/dc/acls/edit.js b/ui-v2/app/routes/dc/acls/edit.js
index be27e8f8ed231313822f982af3c093f1c494e998..9da75030b2cf1ae1e0a0b6cb2b3a263d04cd6242 100644
--- a/ui-v2/app/routes/dc/acls/edit.js
+++ b/ui-v2/app/routes/dc/acls/edit.js
@@ -10,7 +10,6 @@ export default Route.extend(WithAclActions, {
model: function(params) {
return hash({
routeName: this.routeName,
- isLoading: false,
item: this.repo.findBySlug(params.id, this.modelFor('dc').dc.Name),
types: ['management', 'client'],
});
diff --git a/ui-v2/app/routes/dc/acls/index.js b/ui-v2/app/routes/dc/acls/index.js
index 68ef9612a10084c45b270417a0df38f358950dfb..b1e540da630af1e3ecc8e80dcc9c136cba71b10c 100644
--- a/ui-v2/app/routes/dc/acls/index.js
+++ b/ui-v2/app/routes/dc/acls/index.js
@@ -29,7 +29,6 @@ export default Route.extend(WithAclActions, {
model: function(params) {
return hash({
routeName: this.routeName,
- isLoading: false,
items: this.repo.findAllByDatacenter(this.modelFor('dc').dc.Name),
token: this.settings.findBySlug('token'),
});
diff --git a/ui-v2/app/routes/dc/acls/policies/index.js b/ui-v2/app/routes/dc/acls/policies/index.js
index b2f165158bd280a3169bfe15dca21a907e4465b5..710eda47dde4629b83d8057425369e2a7e92c330 100644
--- a/ui-v2/app/routes/dc/acls/policies/index.js
+++ b/ui-v2/app/routes/dc/acls/policies/index.js
@@ -22,7 +22,6 @@ export default Route.extend(WithPolicyActions, {
),
}),
routeName: this.routeName,
- isLoading: false,
});
},
setupController: function(controller, model) {
diff --git a/ui-v2/app/routes/dc/acls/roles/index.js b/ui-v2/app/routes/dc/acls/roles/index.js
index 361ca6e4d216b1349d75c444d559ec5d9384f03e..4d7934880061c543153bb2810e9737a156daf2ca 100644
--- a/ui-v2/app/routes/dc/acls/roles/index.js
+++ b/ui-v2/app/routes/dc/acls/roles/index.js
@@ -22,7 +22,6 @@ export default Route.extend(WithRoleActions, {
),
}),
routeName: this.routeName,
- isLoading: false,
});
},
setupController: function(controller, model) {
diff --git a/ui-v2/app/routes/dc/acls/tokens/index.js b/ui-v2/app/routes/dc/acls/tokens/index.js
index 71d6dc81bfa45ae2774f64e6c7e7eb9e2c2d1d03..0bd8166e3a4c6a48caa7323a5be2ff8f42bcc9ad 100644
--- a/ui-v2/app/routes/dc/acls/tokens/index.js
+++ b/ui-v2/app/routes/dc/acls/tokens/index.js
@@ -34,7 +34,6 @@ export default Route.extend(WithTokenActions, {
}),
routeName: this.routeName,
nspace: this.modelFor('nspace').nspace.substr(1),
- isLoading: false,
token: this.settings.findBySlug('token'),
});
},
diff --git a/ui-v2/app/routes/dc/kv/index.js b/ui-v2/app/routes/dc/kv/index.js
index e11b59fc57bb9b36b8fbd9165e1be2344282c86c..4de664e13848ec0a7e50ee2c3eb7b8b09bf3e51f 100644
--- a/ui-v2/app/routes/dc/kv/index.js
+++ b/ui-v2/app/routes/dc/kv/index.js
@@ -26,7 +26,6 @@ export default Route.extend({
const dc = this.modelFor('dc').dc.Name;
const nspace = this.modelFor('nspace').nspace.substr(1);
return hash({
- isLoading: false,
routeName: this.routeName,
parent: this.repo.findBySlug(key, dc, nspace),
}).then(model => {
diff --git a/ui-v2/app/routes/dc/nspaces/edit.js b/ui-v2/app/routes/dc/nspaces/edit.js
index 94f9a41d21ac610632a5705e6a9c9b335e5dbe28..a7e1159ec8d61e93fdba9cee819699a4dca4f347 100644
--- a/ui-v2/app/routes/dc/nspaces/edit.js
+++ b/ui-v2/app/routes/dc/nspaces/edit.js
@@ -15,7 +15,6 @@ export default Route.extend(WithNspaceActions, {
const dc = this.modelFor('dc').dc.Name;
return hash({
routeName: this.routeName,
- isLoading: false,
create: create,
dc: dc,
item: create
diff --git a/ui-v2/app/routes/dc/nspaces/index.js b/ui-v2/app/routes/dc/nspaces/index.js
index 86d868e591676e565ed579a140fd0d6b505b0632..b5ae81843cd50e081b678f9841080bbd9348b1d5 100644
--- a/ui-v2/app/routes/dc/nspaces/index.js
+++ b/ui-v2/app/routes/dc/nspaces/index.js
@@ -17,7 +17,6 @@ export default Route.extend(WithNspaceActions, {
return hash({
routeName: this.routeName,
items: this.data.source(uri => uri`/*/*/namespaces`),
- isLoading: false,
});
},
setupController: function(controller, model) {
diff --git a/ui-v2/app/routing/single.js b/ui-v2/app/routing/single.js
index de247dbfc721315650c7e335db72711d311f6839..45e9b942813f1d87720deea2af0ad767a7857f1f 100644
--- a/ui-v2/app/routing/single.js
+++ b/ui-v2/app/routing/single.js
@@ -16,7 +16,6 @@ export default Route.extend({
const nspace = this.modelFor('nspace').nspace.substr(1);
const create = this.isCreate(...arguments);
return hash({
- isLoading: false,
dc: dc,
nspace: nspace,
create: create,
diff --git a/ui-v2/app/templates/dc/acls/edit.hbs b/ui-v2/app/templates/dc/acls/edit.hbs
index c42ef6915fb3ace19582d8f0cf2df4d46e8d65b1..2e9370103614f42fef54a0373a95ae54bb7a5d4c 100644
--- a/ui-v2/app/templates/dc/acls/edit.hbs
+++ b/ui-v2/app/templates/dc/acls/edit.hbs
@@ -1,4 +1,4 @@
-<AppView @class="acl edit" @loading={{isLoading}}>
+<AppView>
<BlockSlot @name="notification" as |status type|>
{{partial 'dc/acls/notifications'}}
</BlockSlot>
diff --git a/ui-v2/app/templates/dc/acls/index.hbs b/ui-v2/app/templates/dc/acls/index.hbs
index 35fc23195d6b0e2f5da77ac2d4f25661a20f4823..ddd7e96df1f1c8d67a08931c7fd77e1981741799 100644
--- a/ui-v2/app/templates/dc/acls/index.hbs
+++ b/ui-v2/app/templates/dc/acls/index.hbs
@@ -7,7 +7,7 @@
)
as |filter|
}}
-<AppView @class="acl list" @loading={{isLoading}}>
+<AppView>
<BlockSlot @name="notification" as |status type|>
{{partial 'dc/acls/notifications'}}
</BlockSlot>
diff --git a/ui-v2/app/templates/dc/acls/policies/edit.hbs b/ui-v2/app/templates/dc/acls/policies/edit.hbs
index 495648c019971510f8c23f9d8a369faedf247ccd..f8d6da71538ba84f07055e0f900e9d9fe25bd763 100644
--- a/ui-v2/app/templates/dc/acls/policies/edit.hbs
+++ b/ui-v2/app/templates/dc/acls/policies/edit.hbs
@@ -8,8 +8,6 @@
{{title 'Access Controls'}}
{{/if}}
<AppView
- @class={{concat "policy " (if isAuthorized "edit" "list")}}
- @loading={{isLoading}}
@authorized={{isAuthorized}}
@enabled={{isEnabled}}
>
diff --git a/ui-v2/app/templates/dc/acls/policies/index.hbs b/ui-v2/app/templates/dc/acls/policies/index.hbs
index b7c7094b62c3b139c2ef357400a9172a7c333db2..b7fb63dca39e175f048eca1f86d34a0ba3b26aa3 100644
--- a/ui-v2/app/templates/dc/acls/policies/index.hbs
+++ b/ui-v2/app/templates/dc/acls/policies/index.hbs
@@ -9,8 +9,6 @@
) as |filters|}}
{{#let (or sortBy "Name:asc") as |sort|}}
<AppView
- @class="policy list"
- @loading={{isLoading}}
@authorized={{isAuthorized}}
@enabled={{isEnabled}}
>
diff --git a/ui-v2/app/templates/dc/acls/roles/edit.hbs b/ui-v2/app/templates/dc/acls/roles/edit.hbs
index f07dc5d35b9ac5a938bb54f7eecb52ef1f0f169c..5cc6c36ba80840781840139b9daf741f8334b12a 100644
--- a/ui-v2/app/templates/dc/acls/roles/edit.hbs
+++ b/ui-v2/app/templates/dc/acls/roles/edit.hbs
@@ -8,8 +8,6 @@
{{title 'Access Controls'}}
{{/if}}
<AppView
- @class={{concat "role " (if isAuthorized "edit" "list")}}
- @loading={{isLoading}}
@authorized={{isAuthorized}}
@enabled={{isEnabled}}
>
diff --git a/ui-v2/app/templates/dc/acls/roles/index.hbs b/ui-v2/app/templates/dc/acls/roles/index.hbs
index b3732253676aec1be15ffb2d32b33308d2062adb..738d4f36fef603e37b85e240b8540f26a6289af1 100644
--- a/ui-v2/app/templates/dc/acls/roles/index.hbs
+++ b/ui-v2/app/templates/dc/acls/roles/index.hbs
@@ -6,8 +6,6 @@
{{#let (or sortBy "Name:asc") as |sort|}}
<AppView
- @class="role list"
- @loading={{isLoading}}
@authorized={{isAuthorized}}
@enabled={{isEnabled}}
>
diff --git a/ui-v2/app/templates/dc/acls/tokens/edit.hbs b/ui-v2/app/templates/dc/acls/tokens/edit.hbs
index e648a8058214f54fe65af88d03491fc64abb1ca0..bc7bb1b6e349ae8ca3af95e42ec00a1acc012dc3 100644
--- a/ui-v2/app/templates/dc/acls/tokens/edit.hbs
+++ b/ui-v2/app/templates/dc/acls/tokens/edit.hbs
@@ -8,8 +8,6 @@
{{title 'Access Controls'}}
{{/if}}
<AppView
- @class={{concat "token " (if isAuthorized "edit" "list")}}
- @loading={{isLoading}}
@authorized={{isAuthorized}}
@enabled={{isEnabled}}
>
diff --git a/ui-v2/app/templates/dc/acls/tokens/index.hbs b/ui-v2/app/templates/dc/acls/tokens/index.hbs
index d1fad80e13c23a37b3f0779156a7d22e3f62333f..f5dbad25e3704dee05d30cd4a09ccf23d395594a 100644
--- a/ui-v2/app/templates/dc/acls/tokens/index.hbs
+++ b/ui-v2/app/templates/dc/acls/tokens/index.hbs
@@ -9,8 +9,6 @@
) as |filters|}}
{{#let (or sortBy "CreateTime:desc") as |sort|}}
<AppView
- @class="token list"
- @loading={{isLoading}}
@authorized={{isAuthorized}}
@enabled={{isEnabled}}
>
diff --git a/ui-v2/app/templates/dc/intentions/edit.hbs b/ui-v2/app/templates/dc/intentions/edit.hbs
index 4ebf47a875dab91520661bc907dad1a76e3ff25c..3180d600a621b1d83216a9f4b18d0bfb853b0b8d 100644
--- a/ui-v2/app/templates/dc/intentions/edit.hbs
+++ b/ui-v2/app/templates/dc/intentions/edit.hbs
@@ -3,7 +3,7 @@
{{else}}
{{title 'New Intention'}}
{{/if}}
-<AppView @class="intention edit">
+<AppView>
<BlockSlot @name="breadcrumbs">
<ol>
<li><a data-test-back href={{href-to 'dc.intentions'}}>All Intentions</a></li>
diff --git a/ui-v2/app/templates/dc/intentions/index.hbs b/ui-v2/app/templates/dc/intentions/index.hbs
index 80047c2ddcdcce853d5e106149f9a1ecb8ec1c18..f7511e7ce99b7ba65825fa2086b678da21b9bce3 100644
--- a/ui-v2/app/templates/dc/intentions/index.hbs
+++ b/ui-v2/app/templates/dc/intentions/index.hbs
@@ -11,7 +11,7 @@
accesses=(if access (split access ',') undefined)
) as |filters|}}
{{#let (or sortBy "Action:asc") as |sort|}}
- <AppView @class="intention list">
+ <AppView>
<BlockSlot @name="header">
<h1>
Intentions <em>{{format-number items.length}} total</em>
diff --git a/ui-v2/app/templates/dc/kv/edit.hbs b/ui-v2/app/templates/dc/kv/edit.hbs
index fcb15f31a9bee8e9a5f00f3bdc9a02bfc4fa724d..894921ad8ee1d20764369f46031993cb62941420 100644
--- a/ui-v2/app/templates/dc/kv/edit.hbs
+++ b/ui-v2/app/templates/dc/kv/edit.hbs
@@ -3,7 +3,7 @@
{{else}}
{{title 'New Key/Value'}}
{{/if}}
-<AppView @class="kv edit">
+<AppView>
<BlockSlot @name="breadcrumbs">
<ol>
<li><a data-test-back href={{href-to 'dc.kv.index'}}>Key / Values</a></li>
diff --git a/ui-v2/app/templates/dc/kv/index.hbs b/ui-v2/app/templates/dc/kv/index.hbs
index b21cdafd339cf419dedf41a5e2494262466794a4..c6b056067cc23a5bc9b98c89135f4712bcc753e0 100644
--- a/ui-v2/app/templates/dc/kv/index.hbs
+++ b/ui-v2/app/templates/dc/kv/index.hbs
@@ -1,6 +1,6 @@
{{title 'Key/Value'}}
{{#let (or sortBy "isFolder:asc") as |sort|}}
- <AppView @class="kv list">
+ <AppView>
<BlockSlot @name="breadcrumbs">
<ol>
{{#if (not-eq parent.Key '/') }}
diff --git a/ui-v2/app/templates/dc/nodes/index.hbs b/ui-v2/app/templates/dc/nodes/index.hbs
index 558b182054267a2b4dde4979cfdaf450fe051e50..19dd4c27b0ba9e9384b5d71b3dd965c07c36ab69 100644
--- a/ui-v2/app/templates/dc/nodes/index.hbs
+++ b/ui-v2/app/templates/dc/nodes/index.hbs
@@ -4,7 +4,7 @@
statuses=(if status (split status ',') undefined)
) as |filters|}}
{{#let (or sortBy "Node:asc") as |sort|}}
- <AppView @class="node list">
+ <AppView>
<BlockSlot @name="header">
<h1>
Nodes <em>{{format-number items.length}} total</em>
diff --git a/ui-v2/app/templates/dc/nodes/show.hbs b/ui-v2/app/templates/dc/nodes/show.hbs
index 44ef5966cd5a345bae26d7d327aa14df754ece8c..146f84c44af62530692acedcca42ddd1341403c1 100644
--- a/ui-v2/app/templates/dc/nodes/show.hbs
+++ b/ui-v2/app/templates/dc/nodes/show.hbs
@@ -29,7 +29,7 @@
</BlockSlot>
<BlockSlot @name="loaded">
- <AppView @class="node show">
+ <AppView>
<BlockSlot @name="notification" as |status type|>
{{!TODO: Move sessions to its own folder within nodes }}
{{partial 'dc/nodes/notifications'}}
diff --git a/ui-v2/app/templates/dc/nspaces/edit.hbs b/ui-v2/app/templates/dc/nspaces/edit.hbs
index da9c675882d4e5ebda964dc62d4531e6fcf2b460..d19f889a7400ad5e323910d28960d65679dd852e 100644
--- a/ui-v2/app/templates/dc/nspaces/edit.hbs
+++ b/ui-v2/app/templates/dc/nspaces/edit.hbs
@@ -3,7 +3,7 @@
{{else}}
{{title 'Edit Namespace'}}
{{/if}}
-<AppView @class="nspace edit" @loading={{isLoading}}>
+<AppView>
<BlockSlot @name="notification" as |status type item error|>
{{partial 'dc/nspaces/notifications'}}
</BlockSlot>
diff --git a/ui-v2/app/templates/dc/nspaces/index.hbs b/ui-v2/app/templates/dc/nspaces/index.hbs
index 034d71331d1e03781ae3f4432c09557d260fc2d2..25fb43c91a59fea6484cbcdca5ab0a165d512928 100644
--- a/ui-v2/app/templates/dc/nspaces/index.hbs
+++ b/ui-v2/app/templates/dc/nspaces/index.hbs
@@ -1,7 +1,7 @@
{{title 'Namespaces'}}
{{#let (or sortBy "Name:asc") as |sort|}}
<EventSource @src={{items}} />
-<AppView @class="nspace list" @loading={{isLoading}}>
+<AppView>
<BlockSlot @name="notification" as |status type subject|>
{{partial 'dc/nspaces/notifications'}}
</BlockSlot>
diff --git a/ui-v2/app/templates/dc/services/index.hbs b/ui-v2/app/templates/dc/services/index.hbs
index 3eacce3fc944287893036d6681cc2670afa0cd74..1365e8780ded1482e458fd814ac6eb614433d92d 100644
--- a/ui-v2/app/templates/dc/services/index.hbs
+++ b/ui-v2/app/templates/dc/services/index.hbs
@@ -6,7 +6,7 @@
sources=(if source (split source ',') undefined)
) as |filters|}}
{{#let (or sortBy "Name:asc") as |sort|}}
- <AppView @class="service list">
+ <AppView>
<BlockSlot @name="notification" as |status type|>
{{partial 'dc/services/notifications'}}
</BlockSlot>
diff --git a/ui-v2/app/templates/dc/services/instance.hbs b/ui-v2/app/templates/dc/services/instance.hbs
index 056198680b1c51b4b392d5621be2c49c231daa27..d9db2a6585e34e8e159c7f045dea2019b1027419 100644
--- a/ui-v2/app/templates/dc/services/instance.hbs
+++ b/ui-v2/app/templates/dc/services/instance.hbs
@@ -2,7 +2,7 @@
<EventSource @src={{item}} @onerror={{action "error"}} />
<EventSource @src={{proxy}} />
<EventSource @src={{proxyMeta}} />
-<AppView @class="instance show">
+<AppView>
<BlockSlot @name="notification" as |status type|>
{{partial 'dc/services/notifications'}}
</BlockSlot>
diff --git a/ui-v2/app/templates/dc/services/show.hbs b/ui-v2/app/templates/dc/services/show.hbs
index 3ed91ab06fdb2e8356969084f37600912ca0b8e7..0b1a373e12a6b23615067921163e10412c853027 100644
--- a/ui-v2/app/templates/dc/services/show.hbs
+++ b/ui-v2/app/templates/dc/services/show.hbs
@@ -4,7 +4,7 @@
<EventSource @src={{proxies}} />
<EventSource @src={{gatewayServices}} />
{{title item.Service.Service}}
-<AppView @class="service show">
+<AppView>
<BlockSlot @name="notification" as |status type|>
{{partial 'dc/services/notifications'}}
</BlockSlot>
diff --git a/ui-v2/app/templates/settings.hbs b/ui-v2/app/templates/settings.hbs
index 27523164b0414555c0fbc21fd3a4066c484a30cf..94e719bedbb6783d12058c6ee8ceb2aa8bbeb48a 100644
--- a/ui-v2/app/templates/settings.hbs
+++ b/ui-v2/app/templates/settings.hbs
@@ -1,5 +1,5 @@
{{title "Settings"}}
-<AppView @class="settings show">
+<AppView>
<BlockSlot @name="header">
<h1>
Settings