Skip to content

TT-7380 fix: auto-save when editing Segment Reference in Mark Verse step #353

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
gtryus merged 2 commits into from
Jun 11, 2026
Merged

TT-7380 fix: auto-save when editing Segment Reference in Mark Verse step #353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
69df630
TT-7380 fix: auto-save when editing Segment Reference in Mark Verse step
nabalone Jun 10, 2026
54c1a20
remove unnecessary isChanged check (code review)
nabalone Jun 11, 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
11 changes: 10 additions & 1 deletion src/renderer/src/components/PassageDetail/PassageDetailMarkVerses.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,15 +537,24 @@ test('blocks autosave when markup has hard reference errors', async () => {
?.firstChild as HTMLElement;
await waitFor(() => expect(tbody.children.length).toBeTruthy());

// Load saved segment data with an out-of-passage ref ("9:9") into the table.
act(() => {
if (mockPlayerAction) {
mockPlayerAction(
'{"regions":"[{\\"start\\":0,\\"end\\":5,\\"label\\":\\"9:9\\"}]"}',
false
true
);
}
});

// Simulate a user boundary edit (init=false) so checkBlockersAndScheduleAutosave
// runs with "9:9" still in the table — the blocker should be detected and warned.
act(() => {

@nabalone nabalone Jun 11, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot claims this test had previously been passing only by accident

if (mockPlayerAction) {
mockPlayerAction('{"regions":"[{\\"start\\":0,\\"end\\":6}]"}', false);
}
});

await waitFor(() => {
expect(mockShowMessage).toHaveBeenCalledWith(
expect.anything(),
Expand Down
14 changes: 8 additions & 6 deletions src/renderer/src/components/PassageDetail/PassageDetailMarkVerses.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,6 @@ export function PassageDetailMarkVerses({ width }: MarkVersesProps) {
const {
toolChanged,
toolsChanged,
isChanged,
saveRequested,
saveCompleted,
clearRequested,
Expand Down Expand Up @@ -616,7 +615,10 @@ export function PassageDetailMarkVerses({ width }: MarkVersesProps) {
if (reset) {
resetSegments(regions);
}
if (!init && !isChanged(verseToolId)) toolChanged(verseToolId);
if (!init) {
toolChanged(verseToolId);
checkBlockersAndScheduleAutosave();
}
}
};

Expand Down Expand Up @@ -741,6 +743,7 @@ export function PassageDetailMarkVerses({ width }: MarkVersesProps) {
setData(newData);
setSegments();
toolChanged(verseToolId);
checkBlockersAndScheduleAutosave();
}
};

Expand Down Expand Up @@ -845,8 +848,8 @@ export function PassageDetailMarkVerses({ width }: MarkVersesProps) {
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [toolsChanged, scheduleAutosave]);

useEffect(() => {

@nabalone nabalone Jun 11, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Devin flagged that we are now further diverging from the mobile version, which still uses an effect for this. But the logic is already different enough in the mobile version that I was thinking this is fine

if (!isChanged(verseToolId) || !hasPermission || savingRef.current) return;
const checkBlockersAndScheduleAutosave = () => {
if (!hasPermission) return;
const allIssues = checkRefs();
const blockers = checkAutosaveBlockers();
setSaveIssues(allIssues);
Expand Down Expand Up @@ -885,8 +888,7 @@ export function PassageDetailMarkVerses({ width }: MarkVersesProps) {
setIssuesDialogOpen(false);
}
scheduleAutosave();
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [toolsChanged, hasPermission, scheduleAutosave]);
};

return Boolean(mediafileId) && passType !== PassageTypeEnum.NOTE ? (
<Box>
Expand Down
7 changes: 4 additions & 3 deletions src/renderer/src/hoc/SnackBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable react-refresh/only-export-components */
import { useState, useEffect } from 'react';
import { useState, useEffect, Fragment } from 'react';
import { useGlobal } from '../context/useGlobal';
import {
Snackbar as MuiSnackbar,
Expand Down Expand Up @@ -45,8 +45,9 @@ function SimpleSnackbar(props: ISBProps) {
};

useEffect(() => {
if ((message?.type === 'span') !== open) {
setOpen(!open);
const hasMessage = !!message && message.type !== Fragment;

@nabalone nabalone Jun 11, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm a little nervous about this change because the SnackBar is used in so many different places. But it definitely seems like a bug that previously toasts weren't appearing because their messages were wrapped in non-spans

if (hasMessage !== open) {
setOpen(hasMessage);
}
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [message]);
Expand Down
Loading