RHIROS-1302 enable group sorting (#294)

* RHIROS-1302 enable group sorting * code refactor - moved groups object to constant file
RedHatInsights · Dec 8, 2023 · fd14d68 · fd14d68
1 parent 2cec84d
commit fd14d68
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 15 deletions.
diff --git a/src/Routes/RosPage/RosPage.js b/src/Routes/RosPage/RosPage.js
@@ -32,7 +32,6 @@ import {
 import { DownloadExecutivePDFReport } from '../../Components/Reports/ExecutivePDFReport';
 import { useChrome } from '@redhat-cloud-services/frontend-components/useChrome';
 import { conditionalFilterType } from '@redhat-cloud-services/frontend-components';
-import { displayGroup } from '../../Components/RosTable/RenderColumn';
 import { useLocation } from 'react-router-dom';
 
 /**
@@ -64,7 +63,7 @@ class RosPage extends React.Component {
 
         this.sortingHeader = {
             display_name: 'display_name', /* eslint-disable-line camelcase */
-            group_name: 'group_name', /* eslint-disable-line camelcase */
+            groups: 'group_name', /* eslint-disable-line camelcase */
             os: 'os',
             'performance_utilization.cpu': 'cpu',
             'performance_utilization.memory': 'memory',
@@ -85,19 +84,6 @@ class RosPage extends React.Component {
         await this.props.isROSConfigured();
         this.processQueryParams();
         this.processFilterValues();
-
-        SYSTEM_TABLE_COLUMNS.splice(1, 0,  {
-            key: 'groups',
-            title: 'Group',
-            modalTitle: 'Group',
-            dataLabel: 'Group',
-            renderFunc: (data) => displayGroup(data),
-            isChecked: true,
-            isDisabled: false,
-            isShownByDefault: true,
-            props: { isStatic: true }
-        });
-
     }
 
     processQueryParams() {

diff --git a/src/Utilities/api.js b/src/Utilities/api.js
@@ -64,6 +64,7 @@ export const fetchSystems = async (fetchParams) => {
 
     const sortingHeader = {
         display_name: 'display_name', /* eslint-disable-line camelcase */
+        groups: 'group_name', /* eslint-disable-line camelcase */
         os: 'os',
         'performance_utilization.cpu': 'cpu',
         'performance_utilization.memory': 'memory',

diff --git a/src/constants.js b/src/constants.js
@@ -9,6 +9,7 @@ import {
 } from './store/entitiesReducer';
 import {
     diskUsageData,
+    displayGroup,
     displayLastReported,
     displayOS
 } from './Components/RosTable/RenderColumn';
@@ -96,6 +97,16 @@ export const SYSTEM_TABLE_COLUMNS = [
         isDisabled: true,
         isShownByDefault: true
     },
+    {
+        key: 'groups',
+        title: 'Group',
+        modalTitle: 'Group',
+        dataLabel: 'Group',
+        renderFunc: (data) => displayGroup(data),
+        isChecked: true,
+        isDisabled: false,
+        isShownByDefault: true
+    },
     {
         key: 'os',
         title: (