feat(RHINENG-1840): Support sort by group column (#679)

Implements https://issues.redhat.com/browse/RHINENG-1840. Recognise group column sort parameter (when available).
RedHatInsights · Nov 14, 2023 · b0f4f25 · b0f4f25
1 parent aa3c54b
commit b0f4f25
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/src/SmartComponents/ComplianceSystems/ComplianceSystems.js b/src/SmartComponents/ComplianceSystems/ComplianceSystems.js
@@ -46,6 +46,7 @@ export const ComplianceSystems = () => {
                   }),
                   Columns.inventoryColumn('groups', {
                     requiresDefault: true,
+                    sortBy: ['groups'],
                   }),
                   Columns.inventoryColumn('tags'),
                   Columns.OS,

diff --git a/src/SmartComponents/CreatePolicy/EditPolicySystems.js b/src/SmartComponents/CreatePolicy/EditPolicySystems.js
@@ -103,6 +103,7 @@ export const EditPolicySystems = ({
               },
               Columns.inventoryColumn('groups', {
                 requiresDefault: true,
+                sortBy: ['groups'],
               }),
               Columns.inventoryColumn('tags'),
               Columns.OperatingSystem,

diff --git a/src/SmartComponents/ReportDetails/ReportDetails.js b/src/SmartComponents/ReportDetails/ReportDetails.js
@@ -171,6 +171,7 @@ export const ReportDetails = ({ route }) => {
                   }),
                   Columns.inventoryColumn('groups', {
                     requiresDefault: true,
+                    sortBy: ['groups'],
                   }),
                   Columns.inventoryColumn('tags'),
                   Columns.SsgVersion,

diff --git a/src/SmartComponents/SystemsTable/hooks.js b/src/SmartComponents/SystemsTable/hooks.js
@@ -115,8 +115,12 @@ export const useGetEntities = (fetchEntities, { selected, columns } = {}) => {
   const appendDirection = (attributes, direction) =>
     attributes.map((attribute) => `${attribute}:${direction}`);
 
-  const findColumnByKey = (key) =>
-    (columns || []).find((column) => column.key === key);
+  const findColumnByKey = (sortKey) =>
+    (columns || []).find(
+      (column) =>
+        column.key === sortKey || // group column has a sort key different to its main key
+        (column.key === 'groups' && sortKey === 'group_name')
+    );
 
   return async (
     _ids,