From a468afe50654ccaf1960bb29a54f83cadfe0134c Mon Sep 17 00:00:00 2001
From: Vincent Fiduccia <vincent@rancher.com>
Date: Tue, 29 Aug 2017 10:31:43 -0700
Subject: [PATCH] container grouping

---
 app/balancers/index/template.hbs              |  2 +-
 app/components/containers-header/component.js |  2 ++
 app/components/containers-header/template.hbs | 13 +++++++++----
 app/dns/index/template.hbs                    |  2 +-
 app/volumes/index/template.hbs                |  2 +-
 5 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/app/balancers/index/template.hbs b/app/balancers/index/template.hbs
index cda57446e..301ded5b8 100644
--- a/app/balancers/index/template.hbs
+++ b/app/balancers/index/template.hbs
@@ -1,7 +1,7 @@
 {{#if projectController.showClusterWelcome}}
   {{cluster-welcome}}
 {{else}}
-  {{#containers-header tags=tags}}
+  {{#containers-header tags=tags simpleMode=simpleMode}}
     {{#link-to "new-stack" classNames="btn btn-sm bg-default mr-10"}}{{t 'nav.containers.importCompose'}}{{/link-to}}
     {{#link-to "balancers.run" projects.current.id class="btn btn-sm bg-primary"}}{{t 'nav.containers.addBalancer'}}{{/link-to}}
   {{/containers-header}}
diff --git a/app/components/containers-header/component.js b/app/components/containers-header/component.js
index 645e85e5b..0d15e973f 100644
--- a/app/components/containers-header/component.js
+++ b/app/components/containers-header/component.js
@@ -6,6 +6,8 @@ export default Ember.Component.extend({
   projects: Ember.inject.service(),
 
   tags: null,
+  simpleMode: false,
+  showGroup: true,
 
   tagName: '',
 
diff --git a/app/components/containers-header/template.hbs b/app/components/containers-header/template.hbs
index ddebd2122..96d5845d7 100644
--- a/app/components/containers-header/template.hbs
+++ b/app/components/containers-header/template.hbs
@@ -36,13 +36,18 @@
       </div>
     {{/if}}
 
-    {{#unless simpleMode}}
+    {{#if showGroup}}
       <div class="btn-group p-0 mr-10">
         {{#link-to (query-params group="none") classNames="btn btn-sm bg-default" tooltip=(t 'nav.containers.groupNone')}}<i class="icon icon-container"></i>{{/link-to}}
-        {{#link-to (query-params group="service") classNames="btn btn-sm bg-default" tooltip=(t 'nav.containers.groupService')}}<i class="icon icon-service"></i>{{/link-to}}
-        {{#link-to (query-params group="stack") classNames="btn btn-sm bg-default" tooltip=(t 'nav.containers.groupStack')}}<i class="icon icon-list-nested"></i>{{/link-to}}
+        {{#if simpleMode}}
+          {{!-- In simple the stack one isn't shown, but pretend it's the default --}}
+          {{#link-to (query-params group="stack") classNames="btn btn-sm bg-default" tooltip=(t 'nav.containers.groupService')}}<i class="icon icon-service"></i>{{/link-to}}
+        {{else}}
+          {{#link-to (query-params group="service") classNames="btn btn-sm bg-default" tooltip=(t 'nav.containers.groupService')}}<i class="icon icon-service"></i>{{/link-to}}
+          {{#link-to (query-params group="stack") classNames="btn btn-sm bg-default" tooltip=(t 'nav.containers.groupStack')}}<i class="icon icon-list-nested"></i>{{/link-to}}
+        {{/if}}
       </div>
-    {{/unless}}
+    {{/if}}
 
     {{yield}}
   </div>
diff --git a/app/dns/index/template.hbs b/app/dns/index/template.hbs
index 8f774d105..4b120252b 100644
--- a/app/dns/index/template.hbs
+++ b/app/dns/index/template.hbs
@@ -1,7 +1,7 @@
 {{#if projectController.showClusterWelcome}}
   {{cluster-welcome}}
 {{else}}
-  {{#containers-header tags=tags}}
+  {{#containers-header simpleMode=simpleMode tags=tags showGroup=false}}
     {{#link-to "new-stack" classNames="btn btn-sm bg-default mr-10"}}{{t 'nav.containers.importCompose'}}{{/link-to}}
     {{#link-to "dns.new" projects.current.id class="btn btn-sm bg-primary"}}{{t 'nav.containers.addDns'}}{{/link-to}}
   {{/containers-header}}
diff --git a/app/volumes/index/template.hbs b/app/volumes/index/template.hbs
index b0f330cc6..f9cd38378 100644
--- a/app/volumes/index/template.hbs
+++ b/app/volumes/index/template.hbs
@@ -1,7 +1,7 @@
 {{#if projectController.showClusterWelcome}}
   {{cluster-welcome}}
 {{else}}
-  {{#containers-header tags=tags}}
+  {{#containers-header simpleMode=simpleMode tags=tags showGroup=false}}
     {{#link-to "new-stack" classNames="btn btn-sm bg-default mr-10"}}{{t 'nav.containers.importCompose'}}{{/link-to}}
     {{#link-to "volumes.new" projects.current.id class="btn btn-sm bg-primary"}}{{t 'nav.containers.addVolume'}}{{/link-to}}
   {{/containers-header}}