Create CSV export with only selected query rows

Fixes #2348
specify · May 10, 2023 · 6242d46 · 6242d46
1 parent bb54576
commit 6242d46
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 5 deletions.
diff --git a/specifyweb/frontend/js_src/lib/components/QueryBuilder/Export.tsx b/specifyweb/frontend/js_src/lib/components/QueryBuilder/Export.tsx
@@ -23,6 +23,7 @@ export function QueryExportButtons({
   queryResource,
   getQueryFieldRecords,
   recordSetId,
+  selectedRows,
 }: {
   readonly baseTableName: keyof Tables;
   readonly fields: RA<QueryField>;
@@ -31,6 +32,7 @@ export function QueryExportButtons({
     | (() => RA<SerializedResource<SpQueryField>>)
     | undefined;
   readonly recordSetId: number | undefined;
+  readonly selectedRows: ReadonlySet<number>;
 }): JSX.Element {
   const showConfirmation = (): boolean =>
     fields.some(({ mappingPath }) => !mappingPathIsComplete(mappingPath));

diff --git a/specifyweb/frontend/js_src/lib/components/QueryBuilder/Results.tsx b/specifyweb/frontend/js_src/lib/components/QueryBuilder/Results.tsx
@@ -68,6 +68,7 @@ type Props = {
   readonly createRecordSet: JSX.Element | undefined;
   readonly extraButtons: JSX.Element | undefined;
   readonly tableClassName?: string;
+  readonly selectedRows: GetSet<ReadonlySet<number>>;
 };
 
 export function QueryResults(props: Props): JSX.Element {
@@ -86,6 +87,7 @@ export function QueryResults(props: Props): JSX.Element {
     createRecordSet,
     extraButtons,
     tableClassName = '',
+    selectedRows: [selectedRows, setSelectedRows],
   } = props;
   const visibleFieldSpecs = fieldSpecs.filter(({ isPhantom }) => !isPhantom);
 
@@ -121,9 +123,9 @@ export function QueryResults(props: Props): JSX.Element {
   const [treeRanksLoaded = false] = useAsyncState(fetchTreeRanks, false);
 
   // Ids of selected records
-  const [selectedRows, setSelectedRows] = React.useState<ReadonlySet<number>>(
-    new Set()
-  );
+  // const [selectedRows, setSelectedRows] = React.useState<ReadonlySet<number>>(
+  //   new Set()
+  // );
   const lastSelectedRow = React.useRef<number | undefined>(undefined);
   // Unselect all rows when query is reRun
   React.useEffect(() => setSelectedRows(new Set()), [fieldSpecs]);

diff --git a/specifyweb/frontend/js_src/lib/components/QueryBuilder/ResultsWrapper.tsx b/specifyweb/frontend/js_src/lib/components/QueryBuilder/ResultsWrapper.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 
 import { ajax } from '../../utils/ajax';
-import type { IR, RA } from '../../utils/types';
+import type { GetSet, IR, RA } from '../../utils/types';
 import { keysToLowerCase, replaceItem } from '../../utils/utils';
 import type { SpecifyResource } from '../DataModel/legacyTypes';
 import type { SpecifyModel } from '../DataModel/specifyModel';
@@ -27,12 +27,14 @@ export function QueryResultsWrapper({
   extraButtons,
   model,
   onSelected: handleSelected,
+  // selectedRows: [selectedRows, setSelectedRows],
   ...props
 }: ResultsProps & {
   readonly model: SpecifyModel;
   readonly createRecordSet: JSX.Element | undefined;
   readonly extraButtons: JSX.Element | undefined;
   readonly onSelected?: (selected: RA<number>) => void;
+  readonly selectedRows: GetSet<ReadonlySet<number>>;
 }): JSX.Element | null {
   const newProps = useQueryResultsWrapper(props);
 
@@ -49,6 +51,7 @@ export function QueryResultsWrapper({
           extraButtons={extraButtons}
           model={model}
           onSelected={handleSelected}
+          // selectedRows={[selectedRows, setSelectedRows]}
         />
       </ErrorBoundary>
     </div>
@@ -69,6 +72,7 @@ type ResultsProps = {
      */
     newFields: RA<QueryField>
   ) => void;
+  readonly selectedRows: GetSet<ReadonlySet<number>>;
 };
 
 type PartialProps = Omit<
@@ -99,13 +103,14 @@ export function useQueryResultsWrapper({
   recordSetId,
   forceCollection,
   onSortChange: handleSortChange,
+  selectedRows: [selectedRows, setSelectedRows],
 }: ResultsProps): PartialProps | undefined {
   /*
    * Need to store all props in a state so that query field edits do not affect
    * the query results until query is reRun
    */
   const [props, setProps] = React.useState<
-    Omit<PartialProps, 'totalCount'> | undefined
+    Omit<PartialProps, 'totalCount' | 'selectedRows'> | undefined
   >(undefined);
 
   const [totalCount, setTotalCount] = React.useState<number | undefined>(
@@ -217,5 +222,6 @@ export function useQueryResultsWrapper({
     : {
         ...props,
         totalCount,
+        selectedRows: [selectedRows, setSelectedRows],
       };
 }
diff --git a/specifyweb/frontend/js_src/lib/components/QueryBuilder/Wrapped.tsx b/specifyweb/frontend/js_src/lib/components/QueryBuilder/Wrapped.tsx
@@ -97,6 +97,10 @@ export function QueryBuilder({
   const [query, setQuery] = useResource(queryResource);
   useErrorContext('query', query);
 
+  const [selectedRows, setSelectedRows] = React.useState<ReadonlySet<number>>(
+    new Set()
+  );
+
   const model = getModelById(query.contextTableId);
   const buildInitialState = React.useCallback(
     () =>
@@ -536,6 +540,7 @@ export function QueryBuilder({
                   getQueryFieldRecords={getQueryFieldRecords}
                   queryResource={queryResource}
                   recordSetId={recordSet?.id}
+                  selectedRows={selectedRows}
                 />
               )
             }
@@ -553,6 +558,7 @@ export function QueryBuilder({
               });
               runQuery('regular', fields);
             }}
+            selectedRows={[selectedRows, setSelectedRows]}
           />
         )}
       </Form>