fix(code): ADDON-47626 Fixed the sorting issue for custom mapping (#118)

splunk · Oct 14, 2022 · 97b5cb2 · 97b5cb2
1 parent 8a8e802
commit 97b5cb2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/ui/package.json b/ui/package.json
@@ -77,4 +77,4 @@
   "engines": {
     "node": ">=6"
   }
-}
+}
diff --git a/ui/src/main/webapp/components/table/CustomTable.jsx b/ui/src/main/webapp/components/table/CustomTable.jsx
@@ -186,6 +186,7 @@ function CustomTable({
                 column.push({
                     ...item,
                     sortKey: item.field || null,
+                    isCustomMapping: item.mapping ? true : false
                 });
             });
         }
@@ -203,7 +204,7 @@ function CustomTable({
                     columns.map((headData) => (
                         <Table.HeadCell
                             key={headData.field}
-                            onSort={headData.sortKey ? handleSort : null}
+                            onSort={(e) => headData.sortKey ? handleSort(e, headData) : null}
                             sortKey={headData.sortKey ? headData.sortKey : null}
                             sortDir={
                                 headData.sortKey && headData.sortKey === sortKey ? sortDir : 'none'

diff --git a/ui/src/main/webapp/components/table/TableWrapper.jsx b/ui/src/main/webapp/components/table/TableWrapper.jsx
@@ -14,6 +14,7 @@ import { PAGE_INPUT } from '../../constants/pages';
 function TableWrapper({ page, serviceName, handleRequestModalOpen, handleOpenPageStyleDialog }) {
     const [sortKey, setSortKey] = useState('name');
     const [sortDir, setSortDir] = useState('asc');
+    const [isCustomMapping, setCustomMappingStatus] = useState(false);
     const [loading, setLoading] = useState(true);
     const [error, setError] = useState(null);
 
@@ -45,6 +46,7 @@ function TableWrapper({ page, serviceName, handleRequestModalOpen, handleOpenPag
                         id: val.id,
                         name: val.name,
                         serviceName: service.name,
+                        serviceTitle: service.title || ''
                     };
                 });
                 obj[service.name] = tmpObj;
@@ -154,6 +156,7 @@ function TableWrapper({ page, serviceName, handleRequestModalOpen, handleOpenPag
         const nextSortDir = prevSortDir === 'asc' ? 'desc' : 'asc';
         setSortDir(nextSortDir);
         setSortKey(val.sortKey);
+        setCustomMappingStatus(val.isCustomMapping);
     };
 
     /**
@@ -206,16 +209,18 @@ function TableWrapper({ page, serviceName, handleRequestModalOpen, handleOpenPag
             arr = findByMatchingValue(rowData[searchType]);
         }
 
+        const _sortKey = isCustomMapping ? 'serviceTitle' : sortKey;
+
         // Sort the array based on the sort value
         const sortedArr = arr.sort((rowA, rowB) => {
             if (sortDir === 'asc') {
-                const rowAValue = rowA[sortKey] === undefined ? '' : rowA[sortKey];
-                const rowBValue = rowB[sortKey] === undefined ? '' : rowB[sortKey];
+                const rowAValue = rowA[_sortKey] === undefined ? '' : rowA[_sortKey];
+                const rowBValue = rowB[_sortKey] === undefined ? '' : rowB[_sortKey];
                 return rowAValue > rowBValue ? 1 : -1;
             }
             if (sortDir === 'desc') {
-                const rowAValue = rowA[sortKey] === undefined ? '' : rowA[sortKey];
-                const rowBValue = rowB[sortKey] === undefined ? '' : rowB[sortKey];
+                const rowAValue = rowA[_sortKey] === undefined ? '' : rowA[_sortKey];
+                const rowBValue = rowB[_sortKey] === undefined ? '' : rowB[_sortKey];
                 return rowBValue > rowAValue ? 1 : -1;
             }
             return 0;
-Original file line number
+Diff line change
@@ Expand Up / @@ -77,4 +77,4 @@ @@
       "engines": {
         "node": ">=6"
       }
-    }
+    }