Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bug(inventory groups): fixing columns order in modal #1829

Merged
merged 5 commits into from
Apr 13, 2023
Merged

bug(inventory groups): fixing columns order in modal #1829

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
79e3050
feat(inventory groups): fixed edge case with create group
Fewwy Apr 6, 2023
267d0d4
fix(inventory groups): fixed edge case with cross button
Fewwy Apr 11, 2023
6560e62
bug(inventory groups): fixed order of columns in add system modal
Fewwy Apr 13, 2023
e4864f6
Merge remote-tracking branch 'upstream/master' into fixing-columns-or…
Fewwy Apr 13, 2023
cf10f03
Merge branch 'master' into fixing-columns-order-in-modal
Fewwy Apr 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/GroupSystems/GroupSystems.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@ export const prepareColumns = (initialColumns, hideGroupColumn) => {
// map columns to the speicifc order
return [
'display_name',
'groups',
'tags',
'system_profile',
'update_method',
'groups',
'updated'
].map((colKey) => columns.find(({ key }) => key === colKey))
.filter(Boolean); // eliminate possible undefined's
Expand Down
2 changes: 1 addition & 1 deletion src/components/InventoryGroups/Modals/AddSystemsToGroupModal.cy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ import AddSystemsToGroupModal from './AddSystemsToGroupModal';

const TABLE_HEADERS = [
'Name',
'Group',
'Tags',
'OS',
'Update method',
'Group',
'Last seen'
];

Expand Down