From 7f7bc89d38149928a4ac7cffa35423cb22a529a7 Mon Sep 17 00:00:00 2001 From: Muslimjon <59481011+mkholjuraev@users.noreply.github.com> Date: Wed, 22 May 2024 12:20:44 +0200 Subject: [PATCH] fix: double icons in display name column on package systems table (#1183) * fix: double icons in display name column on package systems table * chore: remove tags column defs from package systems table --- .../Systems/SystemListAssets.test.js | 2 +- src/SmartComponents/Systems/SystemsListAssets.js | 13 ------------- src/Utilities/SystemHelpers.test.js | 4 ++-- 3 files changed, 3 insertions(+), 16 deletions(-) diff --git a/src/SmartComponents/Systems/SystemListAssets.test.js b/src/SmartComponents/Systems/SystemListAssets.test.js index 1d3ad575..5bcef3fd 100644 --- a/src/SmartComponents/Systems/SystemListAssets.test.js +++ b/src/SmartComponents/Systems/SystemListAssets.test.js @@ -23,7 +23,7 @@ describe('SystemListAssets.js', () => { }); it('Should call createUpgradableColumn on Status renderFunc with correct params', () => { - packageSystemsColumns[6].renderFunc('testValue'); + packageSystemsColumns[4].renderFunc('testValue'); expect(createUpgradableColumn).toHaveBeenCalledWith('testValue'); }); diff --git a/src/SmartComponents/Systems/SystemsListAssets.js b/src/SmartComponents/Systems/SystemsListAssets.js index 6fb9da84..27402a92 100644 --- a/src/SmartComponents/Systems/SystemsListAssets.js +++ b/src/SmartComponents/Systems/SystemsListAssets.js @@ -95,19 +95,6 @@ export const advisorySystemsColumns = () => [ ]; export const packageSystemsColumns = [ - { - key: 'display_name', - title: 'Name', - composed: ['facts.os_release', 'display_name'], - props: { - width: 40 - } - }, - { - key: 'tags', - title: 'Tags', - props: { width: 10, isStatic: true } - }, { key: 'os', title: 'OS', diff --git a/src/Utilities/SystemHelpers.test.js b/src/Utilities/SystemHelpers.test.js index 6ef50d2b..7f884b6e 100644 --- a/src/Utilities/SystemHelpers.test.js +++ b/src/Utilities/SystemHelpers.test.js @@ -26,10 +26,10 @@ describe('createSystemsSortBy,', () => { it('should translate updated parameter while having last upload', () => { expect(createSystemsSortBy('updated', 'ASC', true)).toEqual( - 'display_name' + 'os' ); expect(createSystemsSortBy('updated', 'DESC', true)).toEqual( - '-display_name' + '-os' ); }); });