Allow sorting by more columns

MahmudjonToraqulov · May 21, 2024 · 7dab172 · 7dab172
1 parent 6e379da
commit 7dab172
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 11 deletions.
diff --git a/src/components/Search.tsx b/src/components/Search.tsx
@@ -32,8 +32,8 @@ const columnNamesToPropertyMap = {
     [CONST.SEARCH_TABLE_COLUMNS.MERCHANT]: 'merchant' as const,
     [CONST.SEARCH_TABLE_COLUMNS.TOTAL]: 'formattedTotal' as const,
     [CONST.SEARCH_TABLE_COLUMNS.CATEGORY]: 'category' as const,
-    [CONST.SEARCH_TABLE_COLUMNS.TYPE]: null,
-    [CONST.SEARCH_TABLE_COLUMNS.ACTION]: null,
+    [CONST.SEARCH_TABLE_COLUMNS.TYPE]: 'type' as const,
+    [CONST.SEARCH_TABLE_COLUMNS.ACTION]: 'action' as const,
     [CONST.SEARCH_TABLE_COLUMNS.DESCRIPTION]: null,
     [CONST.SEARCH_TABLE_COLUMNS.TAX_AMOUNT]: null,
 };

diff --git a/src/components/SelectionList/SearchTableHeader.tsx b/src/components/SelectionList/SearchTableHeader.tsx
@@ -67,13 +67,11 @@ const SearchColumns: SearchColumnConfig[] = [
     {
         columnName: CONST.SEARCH_TABLE_COLUMNS.TYPE,
         translationKey: 'common.type',
-        isSortable: false,
         shouldShowFn: () => true,
     },
     {
         columnName: CONST.SEARCH_TABLE_COLUMNS.ACTION,
         translationKey: 'common.action',
-        isSortable: false,
         shouldShowFn: () => true,
     },
 ];
@@ -104,6 +102,7 @@ function SearchTableHeader({data, sortBy, sortOrder, onSortPress}: SearchTableHe
 
                     return (
                         <SortableHeaderText
+                            key={translationKey}
                             text={translate(translationKey)}
                             sortOrder={sortOrder ?? 'asc'}
                             isActive={isActive}

diff --git a/...libs/Navigation/AppNavigator/Navigators/CentralPaneNavigator/BaseCentralPaneNavigator.tsx b/...libs/Navigation/AppNavigator/Navigators/CentralPaneNavigator/BaseCentralPaneNavigator.tsx
@@ -5,6 +5,7 @@ import ReportScreenWrapper from '@libs/Navigation/AppNavigator/ReportScreenWrapp
 import getCurrentUrl from '@libs/Navigation/currentUrl';
 import type {CentralPaneNavigatorParamList} from '@navigation/types';
 import SearchPage from '@pages/Search/SearchPage';
+import CONST from '@src/CONST';
 import SCREENS from '@src/SCREENS';
 
 const Stack = createStackNavigator<CentralPaneNavigatorParamList>();
@@ -44,7 +45,7 @@ function BaseCentralPaneNavigator() {
             />
             <Stack.Screen
                 name={SCREENS.SEARCH.CENTRAL_PANE}
-                // We do it this way to avoid adding the url params to url
+                initialParams={{sortBy: CONST.SEARCH_TABLE_COLUMNS.DATE, sortOrder: 'asc'}}
                 component={SearchPage}
             />
 

diff --git a/src/libs/SearchUtils.ts b/src/libs/SearchUtils.ts
@@ -66,11 +66,6 @@ function getTransactionsSections(data: OnyxTypes.SearchResults['data']): Transac
                 shouldShowTax,
                 keyForList: transactionItem.transactionID,
             };
-        })
-        .sort((a, b) => {
-            const createdA = a.modifiedCreated ? a.modifiedCreated : a.created;
-            const createdB = b.modifiedCreated ? b.modifiedCreated : b.created;
-            return createdB > createdA ? 1 : -1;
         });
 }
 

diff --git a/src/styles/utils/index.ts b/src/styles/utils/index.ts
@@ -1582,7 +1582,7 @@ const createStyleUtils = (theme: ThemeColors, styles: ThemeStyles) => ({
                 columnWidth = {...getWidthStyle(variables.w28), ...styles.alignItemsCenter};
                 break;
             case CONST.SEARCH_TABLE_COLUMNS.ACTION:
-                columnWidth = getWidthStyle(variables.w80);
+                columnWidth = {...getWidthStyle(variables.w80), ...styles.alignItemsCenter};
                 break;
             default:
                 columnWidth = styles.flex1;