From 44c0eb867b015f1d705bc61021add58f21fd2bca Mon Sep 17 00:00:00 2001 From: Jake McDermott Date: Wed, 8 Jan 2020 12:03:43 -0500 Subject: [PATCH] Remove group status cols Remove the status col from any group list that used the now-removed computed fields. --- awx/ui/client/legacy/styles/lists.less | 5 +++++ .../inventories/related/groups/groups.list.js | 12 ------------ .../nested-groups/group-nested-groups.list.js | 12 ------------ .../related/nested-groups/host-nested-groups.list.js | 2 +- 4 files changed, 6 insertions(+), 25 deletions(-) diff --git a/awx/ui/client/legacy/styles/lists.less b/awx/ui/client/legacy/styles/lists.less index 3e004461af..6a4922fd2b 100644 --- a/awx/ui/client/legacy/styles/lists.less +++ b/awx/ui/client/legacy/styles/lists.less @@ -598,6 +598,11 @@ table, tbody { } .List-staticColumnLayout--groups { + display: grid; + grid-template-columns: @at-space @at-space-5x auto; +} + +.List-staticColumnLayout--hostNestedGroups { display: grid; grid-template-columns: @at-space @at-space-5x @at-space-5x auto; } diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/groups/groups.list.js b/awx/ui/client/src/inventories-hosts/inventories/related/groups/groups.list.js index c346e06dc6..ffd048de78 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/groups/groups.list.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/groups/groups.list.js @@ -18,18 +18,6 @@ basePath: 'api/v2/inventories/{{$stateParams.inventory_id}}/groups/', layoutClass: 'List-staticColumnLayout--groups', actionHolderClass: 'List-actionHolder List-actionHolder--rootGroups', - staticColumns: [ - { - content: { - label: '', - mode: 'all', - iconOnly: true, - dataPlacement: "top", - columnClass: 'status-column' - } - } - ], - fields: { name: { label: i18n._('Groups'), diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.list.js b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.list.js index 18385106a3..8041662dc3 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.list.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.list.js @@ -17,18 +17,6 @@ trackBy: 'nested_group.id', basePath: 'api/v2/groups/{{$stateParams.group_id}}/children/', layoutClass: 'List-staticColumnLayout--groups', - staticColumns: [ - { - content: { - label: '', - mode: 'all', - iconOnly: true, - dataPlacement: "top", - columnClass: 'status-column' - } - } - ], - fields: { name: { label: i18n._('Groups'), diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups.list.js b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups.list.js index edb206cffb..f945bb5458 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups.list.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups.list.js @@ -16,7 +16,7 @@ multiSelect: true, trackBy: 'nested_group.id', basePath: 'api/v2/hosts/{{$stateParams.host_id}}/all_groups/', - layoutClass: 'List-staticColumnLayout--groups', + layoutClass: 'List-staticColumnLayout--hostNestedGroups', staticColumns: [ { field: 'failed_hosts',