Enable sorting for file util search results (ShokoAnime#812)

Queuecumbr · Feb 14, 2024 · ce28270 · ce28270
1 parent 64f4ca5
commit ce28270
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 12 deletions.
diff --git a/src/components/Utilities/UtilitiesTable.tsx b/src/components/Utilities/UtilitiesTable.tsx
@@ -23,7 +23,7 @@ type Props = {
   isFetchingNextPage: boolean;
   rows: FileType[] | SeriesType[];
   setSortCriteria?: React.Dispatch<React.SetStateAction<FileSortCriteriaEnum>>;
-  skipSort: boolean;
+  skipSort?: boolean;
   sortCriteria?: FileSortCriteriaEnum;
   handleRowSelect?: (id: number, select: boolean) => void;
   rowSelection?: Record<number, boolean>;
@@ -139,7 +139,7 @@ const HeaderItem = (
     id: string;
     name: string;
     setSortCriteria?: React.Dispatch<React.SetStateAction<FileSortCriteriaEnum>>;
-    skipSort: boolean;
+    skipSort?: boolean;
     sortCriteria?: FileSortCriteriaEnum;
   },
 ) => {

diff --git a/src/pages/utilities/FileSearch.tsx b/src/pages/utilities/FileSearch.tsx
@@ -264,7 +264,7 @@ const FileSearch = () => {
   const debouncedSearch = useDebounce(search, 250);
   const filesQuery = useFilesInfiniteQuery({
     include: ['XRefs'],
-    sortOrder: debouncedSearch ? [] : [sortCriteria],
+    sortOrder: [sortCriteria],
     pageSize: 50,
   }, debouncedSearch);
   const [files, fileCount] = useFlattenListResult<FileType>(filesQuery.data);
@@ -338,7 +338,6 @@ const FileSearch = () => {
               rows={files}
               rowSelection={rowSelection}
               setSelectedRows={setRowSelection}
-              skipSort={!!debouncedSearch}
               setSortCriteria={setSortCriteria}
               sortCriteria={sortCriteria}
             />

diff --git a/src/pages/utilities/UnrecognizedUtilityTabs/IgnoredFilesTab.tsx b/src/pages/utilities/UnrecognizedUtilityTabs/IgnoredFilesTab.tsx
@@ -97,9 +97,7 @@ function IgnoredFilesTab() {
     {
       pageSize: 50,
       include_only: ['Ignored'],
-      sortOrder: debouncedSearch
-        ? []
-        : [sortCriteria, FileSortCriteriaEnum.FileName, FileSortCriteriaEnum.RelativePath],
+      sortOrder: [sortCriteria, FileSortCriteriaEnum.FileName, FileSortCriteriaEnum.RelativePath],
     },
     debouncedSearch,
   );
@@ -173,7 +171,6 @@ function IgnoredFilesTab() {
             rowSelection={rowSelection}
             setSelectedRows={setRowSelection}
             setSortCriteria={setSortCriteria}
-            skipSort={!!debouncedSearch}
             sortCriteria={sortCriteria}
           />
         )}

diff --git a/src/pages/utilities/UnrecognizedUtilityTabs/UnrecognizedTab.tsx b/src/pages/utilities/UnrecognizedUtilityTabs/UnrecognizedTab.tsx
@@ -244,9 +244,7 @@ function UnrecognizedTab() {
     {
       pageSize: 50,
       include_only: ['Unrecognized'],
-      sortOrder: debouncedSearch
-        ? []
-        : [sortCriteria, FileSortCriteriaEnum.FileName, FileSortCriteriaEnum.RelativePath],
+      sortOrder: [sortCriteria, FileSortCriteriaEnum.FileName, FileSortCriteriaEnum.RelativePath],
     },
     debouncedSearch,
   );
@@ -402,7 +400,6 @@ function UnrecognizedTab() {
               rowSelection={rowSelection}
               setSelectedRows={setRowSelection}
               setSortCriteria={setSortCriteria}
-              skipSort={!!debouncedSearch}
               sortCriteria={sortCriteria}
             />
           )}