From f3a89c4e5b7fc32972bf48b9563a325f7410ebc7 Mon Sep 17 00:00:00 2001 From: Aleksandr Voznesenskii Date: Tue, 11 Apr 2023 11:02:41 +0200 Subject: [PATCH 1/2] bug(inventory groups): changed the column order to allign with the app --- src/components/GroupSystems/GroupSystems.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/GroupSystems/GroupSystems.js b/src/components/GroupSystems/GroupSystems.js index b5e730b5d..44bfb5dd8 100644 --- a/src/components/GroupSystems/GroupSystems.js +++ b/src/components/GroupSystems/GroupSystems.js @@ -64,8 +64,8 @@ export const prepareColumns = (initialColumns, hideGroupColumn) => { // map columns to the speicifc order return [ 'display_name', - 'system_profile', 'tags', + 'system_profile', 'update_method', 'groups', 'updated' From 4f72ec4e20059319aa1d019f66b0cfaf54dd4f48 Mon Sep 17 00:00:00 2001 From: Aleksandr Voznesenskii Date: Tue, 11 Apr 2023 11:25:15 +0200 Subject: [PATCH 2/2] fix(inventory groups): fixed tests --- src/components/GroupSystems/GroupSystems.cy.js | 2 +- .../InventoryGroups/Modals/AddSystemsToGroupModal.cy.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/GroupSystems/GroupSystems.cy.js b/src/components/GroupSystems/GroupSystems.cy.js index bb778d9d5..a9286371a 100644 --- a/src/components/GroupSystems/GroupSystems.cy.js +++ b/src/components/GroupSystems/GroupSystems.cy.js @@ -40,7 +40,7 @@ import _ from 'lodash'; const GROUP_NAME = 'foobar'; const ROOT = 'div[id="group-systems-table"]'; -const TABLE_HEADERS = ['Name', 'OS', 'Tags', 'Update method', 'Last seen']; +const TABLE_HEADERS = ['Name', 'Tags', 'OS', 'Update method', 'Last seen']; const SORTABLE_HEADERS = ['Name', 'OS', 'Last seen']; const DEFAULT_ROW_COUNT = 50; diff --git a/src/components/InventoryGroups/Modals/AddSystemsToGroupModal.cy.js b/src/components/InventoryGroups/Modals/AddSystemsToGroupModal.cy.js index 8b6c8cd3b..39b7be85d 100644 --- a/src/components/InventoryGroups/Modals/AddSystemsToGroupModal.cy.js +++ b/src/components/InventoryGroups/Modals/AddSystemsToGroupModal.cy.js @@ -26,8 +26,8 @@ import AddSystemsToGroupModal from './AddSystemsToGroupModal'; const TABLE_HEADERS = [ 'Name', - 'OS', 'Tags', + 'OS', 'Update method', 'Group', 'Last seen'