Skip to content

fix(data-views): handle record merging #8624

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CarolineDenis merged 3 commits into from
Oct 5, 2026
+32 −2
Merged

fix(data-views): handle record merging #8624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f736d54
fix(data-views): handle record merging
grantfitzsimmons Oct 2, 2026
d9dc704
fix(data-views): handle deleted records
grantfitzsimmons Oct 2, 2026
34deda5
Merge branch 'main' into issue-8623-mergefix
CarolineDenis Oct 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions specifyweb/frontend/js_src/lib/components/DataViews/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,15 @@ function LoadedDataViewFromTable({
restoreScrollTopRef.current = resultsScrollRef.current.scrollTop;
setRefreshToken((token) => token + 1);
}, []);
const handleMerged = React.useCallback((): void => {
/*
* Merging removes the selected records. Clear the preview before the
* refreshed results arrive so it does not try to load deleted records.
*/
setSelectedIds([]);
setSelectedIndex(0);
handleRefresh();
}, [handleRefresh]);
const handleCloseQueryEditor = (): void => setQueryData(undefined);
const handleOpenQueryEditor = (): void => {
setIsQueryDirty(false);
Expand Down Expand Up @@ -282,6 +291,11 @@ function LoadedDataViewFromTable({
createRecordSet={undefined}
extraButtons={undefined}
onReRun={handleRefresh}
onDeleted={(): void => {
setSelectedIds([]);
setSelectedIndex(0);
}}
onMerged={handleMerged}
onSortChange={(newFields): void => {
setRuntimeFields(unParseQueryFields(table.name, newFields));
setQueryRunCount((count) => count + 1);
Expand Down
11 changes: 9 additions & 2 deletions specifyweb/frontend/js_src/lib/components/QueryBuilder/Results.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,8 @@ export type QueryResultsProps = {
readonly tableClassName?: string;
readonly selectedRows: GetSet<ReadonlySet<number>>;
readonly onResults?: (results: RA<QueryResultRow | undefined>) => void;
readonly onDeleted?: (recordId: number) => void;
readonly onMerged?: () => void;
readonly scrollRef?: React.MutableRefObject<HTMLDivElement | null>;
readonly restoreScrollTopRef?: React.MutableRefObject<number | undefined>;
readonly refreshToken?: number;
Expand All @@ -113,12 +115,14 @@ export function QueryResults(props: QueryResultsProps): JSX.Element {
onSelected: handleSelected,
onSortChange: handleSortChange,
onReRun: handleReRun,
onMerged: handleMerged,
createRecordSet,
extraButtons,
containerClassName = '',
tableClassName = '',
selectedRows: [selectedRows, setSelectedRows],
onResults: handleResults,
onDeleted: handleDeleted,
scrollRef,
restoreScrollTopRef,
refreshToken,
Expand Down Expand Up @@ -497,8 +501,11 @@ export function QueryResults(props: QueryResultsProps): JSX.Element {
<RecordMergingLink
selectedRows={selectedRows}
table={table}
onDeleted={handleDelete}
onMerged={handleReRun}
onDeleted={(recordId): void => {
handleDelete(recordId);
handleDeleted?.(recordId);
}}
onMerged={handleMerged ?? handleReRun}
/>
) : undefined}
{hasToolPermission('recordSets', 'create') && totalCount !== 0 ? (
Expand Down
9 changes: 9 additions & 0 deletions specifyweb/frontend/js_src/lib/components/QueryBuilder/ResultsWrapper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@ export function QueryResultsWrapper({
extraButtons,
onSelected: handleSelected,
onResults: handleResults,
onDeleted: handleDeleted,
onReRun: handleReRun,
onMerged: handleMerged,
refreshToken,
splitPane,
splitHorizontal,
Expand Down Expand Up @@ -66,9 +68,11 @@ export function QueryResultsWrapper({
<QueryResults
{...newProps}
onResults={handleResults}
onDeleted={handleDeleted}
createRecordSet={createRecordSet}
extraButtons={extraButtons}
onReRun={handleReRun}
onMerged={handleMerged}
onSelected={handleSelected}
refreshToken={refreshToken}
/>
Expand Down Expand Up @@ -109,6 +113,8 @@ type ResultsProps = {
readonly containerClassName?: string;
readonly tableClassName?: string;
readonly onResults?: (results: RA<QueryResultRow | undefined>) => void;
readonly onDeleted?: (recordId: number) => void;
readonly onMerged?: () => void;
readonly scrollRef?: React.MutableRefObject<HTMLDivElement | null>;
readonly restoreScrollTopRef?: React.MutableRefObject<number | undefined>;
readonly resultsRef?: React.MutableRefObject<
Expand Down Expand Up @@ -177,6 +183,7 @@ export function useQueryResultsWrapper({
tableClassName,
onSortChange: handleSortChange,
onResults: handleResults,
onMerged: handleMerged,
selectedRows: [selectedRows, setSelectedRows],
scrollRef,
restoreScrollTopRef,
Expand Down Expand Up @@ -260,6 +267,7 @@ export function useQueryResultsWrapper({
fieldSpecs,
initialData,
onResults: handleResults,
onMerged: handleMerged,
scrollRef,
restoreScrollTopRef,
sortConfig: queryFields
Expand Down Expand Up @@ -297,6 +305,7 @@ export function useQueryResultsWrapper({
queryResource,
queryRunCount,
recordSetId,
handleMerged,
]);

return props === undefined
Expand Down
Loading