Merge pull request #1883 from specify/issue-1880

Fix query table sorting not accounting for hidden fields
specify · Jul 23, 2022 · d9776d6 · d9776d6
2 parents e352836 + 9a59df3
commit d9776d6
Showing 1 changed file with 19 additions and 4 deletions.
diff --git a/specifyweb/frontend/js_src/lib/components/queryresultstable.tsx b/specifyweb/frontend/js_src/lib/components/queryresultstable.tsx
@@ -282,7 +282,7 @@ export function QueryResultsTable({
   readonly sortConfig?: RA<QueryField['sortType']>;
   readonly onSelected?: (resource: RA<number>) => void;
   readonly onSortChange?: (
-    fieldIndex: number,
+    fieldSpec: QueryFieldSpec,
     direction: 'ascending' | 'descending' | undefined
   ) => void;
   readonly createRecordSet: JSX.Element | undefined;
@@ -469,7 +469,8 @@ export function QueryResultsTable({
                   sortConfig={sortConfig?.[index]}
                   onSortChange={
                     typeof handleSortChange === 'function'
-                      ? (sortType): void => handleSortChange?.(index, sortType)
+                      ? (sortType): void =>
+                          handleSortChange?.(fieldSpec, sortType)
                       : undefined
                   }
                 />
@@ -642,8 +643,22 @@ export function QueryResultsWrapper({
           totalCount,
           fieldSpecs,
           initialData,
-          sortConfig: fields.map((field) => field.sortType),
-          onSortChange: handleSortChange,
+          sortConfig: fields
+            .filter(({ isDisplay }) => isDisplay)
+            .map(({ sortType }) => sortType),
+          onSortChange:
+            typeof handleSortChange === 'function'
+              ? (fieldSpec, direction) => {
+                  /*
+                   * If some fields are not displayed, visual index and actual
+                   * field index differ
+                   */
+                  const index = fieldSpecs.indexOf(fieldSpec);
+                  const field = displayedFields[index];
+                  const originalIndex = allFields.indexOf(field);
+                  handleSortChange(originalIndex, direction);
+                }
+              : undefined,
           createRecordSet,
           extraButtons,
         })