From 5c874c6b3db66eda74f42d694c70146d57b8a044 Mon Sep 17 00:00:00 2001
From: John Mitchell <jlmitch5@ncsu.edu>
Date: Mon, 4 Jun 2018 17:36:30 -0400
Subject: [PATCH 1/3] fix wrapping issue for instances list

---
 awx/ui/client/lib/components/list/_index.less               | 6 ++++++
 awx/ui/client/lib/theme/_variables.less                     | 2 ++
 .../instance-groups/instances/instances-list.partial.html   | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/awx/ui/client/lib/components/list/_index.less b/awx/ui/client/lib/components/list/_index.less
index 321631559a..06e7d34685 100644
--- a/awx/ui/client/lib/components/list/_index.less
+++ b/awx/ui/client/lib/components/list/_index.less
@@ -262,6 +262,12 @@
     }
 }
 
+@media screen and (max-width: @at-breakpoint-instances-wrap) {
+    .at-Row-items--instances {
+        margin-bottom: @at-padding-bottom-instances-wrap;
+    }
+}
+
 @media screen and (max-width: @at-breakpoint-compact-list) {
     .at-Row-actions {
         flex-direction: column;
diff --git a/awx/ui/client/lib/theme/_variables.less b/awx/ui/client/lib/theme/_variables.less
index 89261e5dc9..3317148e4f 100644
--- a/awx/ui/client/lib/theme/_variables.less
+++ b/awx/ui/client/lib/theme/_variables.less
@@ -247,6 +247,7 @@
 @at-padding-list-row-item-tag: 0 @at-space-2x;
 @at-padding-list-row-action: 7px;
 @at-padding-list-row: 10px 20px 10px 10px;
+@at-padding-bottom-instances-wrap: 30px;
 
 @at-margin-input-message: @at-space;
 @at-margin-item-column: @at-space-3x;
@@ -332,3 +333,4 @@
 
 @at-breakpoint-mobile-layout: @at-breakpoint-sm;
 @at-breakpoint-compact-list: @at-breakpoint-sm;
+@at-breakpoint-instances-wrap: 1036px;
diff --git a/awx/ui/client/src/instance-groups/instances/instances-list.partial.html b/awx/ui/client/src/instance-groups/instances/instances-list.partial.html
index 01868ef35d..9d5f9a8069 100644
--- a/awx/ui/client/src/instance-groups/instances/instances-list.partial.html
+++ b/awx/ui/client/src/instance-groups/instances/instances-list.partial.html
@@ -58,7 +58,7 @@
                     </div>
                 </div>
 
-                <div class="at-Row-items">
+                <div class="at-Row-items at-Row-items--instances">
                     <at-row-item header-value="{{ instance.hostname }}"></at-row-item>
                     <at-row-item
                         label-value="Running Jobs"

From 8bd801fd071b2ed5550c8755bd569e56cfe1d148 Mon Sep 17 00:00:00 2001
From: John Mitchell <jlmitch5@ncsu.edu>
Date: Mon, 4 Jun 2018 17:53:08 -0400
Subject: [PATCH 2/3] make sure instances list is always ordered

---
 awx/ui/client/src/instance-groups/main.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/awx/ui/client/src/instance-groups/main.js b/awx/ui/client/src/instance-groups/main.js
index 387a0740dc..37e9240f23 100644
--- a/awx/ui/client/src/instance-groups/main.js
+++ b/awx/ui/client/src/instance-groups/main.js
@@ -251,7 +251,13 @@ function InstanceGroupsRun ($stateExtender, strings, ComponentsStrings) {
             }
         },
         resolve: {
-            resolvedModels: InstanceGroupsResolve
+            resolvedModels: InstanceGroupsResolve,
+            Dataset: ['GetBasePath', 'QuerySet', '$stateParams',
+                function(GetBasePath, qs, $stateParams) {
+                    let path = `${GetBasePath('instance_groups')}${$stateParams['instance_group_id']}/instances`;
+                    return qs.search(path, $stateParams[`instance_search`]);
+                }
+            ]
         }
     });
 

From 709cf7013896949ca7d425a1c0916abcc20bb6cb Mon Sep 17 00:00:00 2001
From: John Mitchell <jlmitch5@ncsu.edu>
Date: Mon, 11 Jun 2018 09:50:12 -0400
Subject: [PATCH 3/3] use dot notation for state params

---
 awx/ui/client/src/instance-groups/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/awx/ui/client/src/instance-groups/main.js b/awx/ui/client/src/instance-groups/main.js
index 37e9240f23..78b238fefa 100644
--- a/awx/ui/client/src/instance-groups/main.js
+++ b/awx/ui/client/src/instance-groups/main.js
@@ -254,7 +254,7 @@ function InstanceGroupsRun ($stateExtender, strings, ComponentsStrings) {
             resolvedModels: InstanceGroupsResolve,
             Dataset: ['GetBasePath', 'QuerySet', '$stateParams',
                 function(GetBasePath, qs, $stateParams) {
-                    let path = `${GetBasePath('instance_groups')}${$stateParams['instance_group_id']}/instances`;
+                    let path = `${GetBasePath('instance_groups')}${$stateParams.instance_group_id}/instances`;
                     return qs.search(path, $stateParams[`instance_search`]);
                 }
             ]