@@ -2298,13 +2298,22 @@ describe('Interaction-level regression coverage', () => {
expect(global.fetch).toHaveBeenCalledTimes(2);
expect(progressUI.showCancelButton).toHaveBeenCalledTimes(1);
- expect(progressUI.complete).toHaveBeenCalledWith('Matched 5 entries across 2 recipes.');
- // Oracle R4-F1 pin: count comes from `rematched`, a blind `repaired` mirror renders undefined
- expect(showToastMock).toHaveBeenCalledWith(
+ // A non-noop run opens the summary modal instead of toasting; the
+ // progress overlay completes without a message.
+ expect(progressUI.complete).toHaveBeenCalledWith();
+ expect(showToastMock).not.toHaveBeenCalledWith(
'globalContextMenu.rematchRecipes.success',
- { count: 2, recipes: 2, entries: 5, failures: 0 },
- 'success'
+ expect.anything(),
+ expect.anything()
);
+ const summaryModal = document.getElementById('rematchSummaryModal');
+ expect(summaryModal).not.toBeNull();
+ // unresolved_entries > 0 forces the warning header
+ expect(summaryModal.querySelector('.summary-header').classList.contains('warning')).toBe(true);
+ expect(summaryModal.querySelector('.stat-card-success .stat-card-value').textContent).toBe('5');
+ expect(summaryModal.querySelector('.stat-card-skipped .stat-card-value').textContent).toBe('0');
+ expect(summaryModal.querySelector('.stat-card-total .stat-card-value').textContent).toBe('1');
+ expect(summaryModal.querySelector('.stat-card-failure .stat-card-value').textContent).toBe('0');
expect(window.recipesPage.refresh).toHaveBeenCalledTimes(1);
expect(rematchItem.classList.contains('disabled')).toBe(false);
expect(menu._rematchInProgress).toBe(false);
@@ -2313,7 +2322,7 @@ describe('Interaction-level regression coverage', () => {
delete stateStub.currentPageType;
});
- it('uses the warning toast variant when a global rematch completes with failures', async () => {
+ it('opens the summary modal with a warning header when a global rematch completes with failures', async () => {
document.body.innerHTML = `
@@ -2359,19 +2368,18 @@ describe('Interaction-level regression coverage', () => {
}
await runPromise;
- expect(progressUI.complete).toHaveBeenCalledWith('Matched 5 entries across 2 recipes, 2 failed.');
- expect(showToastMock).toHaveBeenCalledWith(
- 'globalContextMenu.rematchRecipes.successErrors',
- { count: 2, recipes: 2, entries: 5, failures: 2 },
- 'warning'
- );
+ expect(progressUI.complete).toHaveBeenCalledWith();
+ const summaryModal = document.getElementById('rematchSummaryModal');
+ expect(summaryModal).not.toBeNull();
+ expect(summaryModal.querySelector('.summary-header').classList.contains('warning')).toBe(true);
+ expect(summaryModal.querySelector('.stat-card-failure .stat-card-value').textContent).toBe('2');
expect(menu._rematchInProgress).toBe(false);
delete window.recipesPage;
delete stateStub.currentPageType;
});
- it('toasts an error when every recipe in a global rematch failed', async () => {
+ it('opens the summary modal with an error header when every recipe in a global rematch failed', async () => {
document.body.innerHTML = `
@@ -2417,19 +2425,18 @@ describe('Interaction-level regression coverage', () => {
}
await runPromise;
- expect(progressUI.complete).toHaveBeenCalledWith('Rematch failed for 3 of 3 recipes.');
- expect(showToastMock).toHaveBeenCalledWith(
- 'globalContextMenu.rematchRecipes.allFailed',
- { total: 3, recipes: 0, entries: 0, failures: 3 },
- 'error'
- );
+ expect(progressUI.complete).toHaveBeenCalledWith();
+ const summaryModal = document.getElementById('rematchSummaryModal');
+ expect(summaryModal).not.toBeNull();
+ expect(summaryModal.querySelector('.summary-header').classList.contains('error')).toBe(true);
+ expect(summaryModal.querySelector('.stat-card-failure .stat-card-value').textContent).toBe('3');
expect(menu._rematchInProgress).toBe(false);
delete window.recipesPage;
delete stateStub.currentPageType;
});
- it('toasts an info message when a global rematch found no local matches', async () => {
+ it('opens the summary modal listing unresolved entries when a global rematch found no local matches', async () => {
document.body.innerHTML = `
@@ -2475,19 +2482,18 @@ describe('Interaction-level regression coverage', () => {
}
await runPromise;
- expect(progressUI.complete).toHaveBeenCalledWith('No local match found for 2 entries in 1 recipes.');
- expect(showToastMock).toHaveBeenCalledWith(
- 'globalContextMenu.rematchRecipes.noMatch',
- { entries: 2, recipes: 1, total: 3, failures: 0 },
- 'info'
- );
+ expect(progressUI.complete).toHaveBeenCalledWith();
+ const summaryModal = document.getElementById('rematchSummaryModal');
+ expect(summaryModal).not.toBeNull();
+ expect(summaryModal.querySelector('.summary-header').classList.contains('warning')).toBe(true);
+ expect(summaryModal.querySelector('.stat-card-total .stat-card-value').textContent).toBe('2');
expect(menu._rematchInProgress).toBe(false);
delete window.recipesPage;
delete stateStub.currentPageType;
});
- it('toasts the rematched count when a global rematch is cancelled', async () => {
+ it('opens the summary modal marked as cancelled when a global rematch is cancelled', async () => {
document.body.innerHTML = `
@@ -2533,11 +2539,11 @@ describe('Interaction-level regression coverage', () => {
await runPromise;
expect(progressUI.complete).toHaveBeenCalledWith('Rematch cancelled. 1 recipes updated (2 entries).');
- expect(showToastMock).toHaveBeenCalledWith(
- 'globalContextMenu.rematchRecipes.cancelled',
- { count: 1, recipes: 1, entries: 2 },
- 'info'
- );
+ const summaryModal = document.getElementById('rematchSummaryModal');
+ expect(summaryModal).not.toBeNull();
+ expect(summaryModal.querySelector('.rematch-cancelled-note')).not.toBeNull();
+ expect(summaryModal.querySelector('.summary-header').classList.contains('warning')).toBe(true);
+ expect(summaryModal.querySelector('.stat-card-success .stat-card-value').textContent).toBe('2');
expect(menu._rematchInProgress).toBe(false);
delete stateStub.currentPageType;
diff --git a/tests/frontend/components/recipeContextMenu.rematch.test.js b/tests/frontend/components/recipeContextMenu.rematch.test.js
index 0aea586b..909155be 100644
--- a/tests/frontend/components/recipeContextMenu.rematch.test.js
+++ b/tests/frontend/components/recipeContextMenu.rematch.test.js
@@ -60,13 +60,6 @@ async function cancelRematchOptions() {
rematchModalManager.cancelOptions();
}
-async function getRematchModalManager() {
- const { rematchModalManager } = await import(
- '../../../static/js/managers/RematchModalManager.js'
- );
- return rematchModalManager;
-}
-
describe('RecipeContextMenu.rematchRecipe', () => {
beforeEach(() => {
vi.clearAllMocks();
@@ -92,8 +85,8 @@ describe('RecipeContextMenu.rematchRecipe', () => {
}
// Oracle R4-F1 pin: branches on `result.rematched > 0` — a blind `repaired`
- // mirror would fire the skipped toast here.
- it('posts to the per-recipe rematch endpoint and toasts the rematched count', async () => {
+ // mirror would render 0 matched entries in the summary modal here.
+ it('posts to the per-recipe rematch endpoint and opens the summary modal', async () => {
const menu = await createMenu();
const card = document.getElementById('card');
menu.showMenu(100, 100, card);
@@ -125,16 +118,22 @@ describe('RecipeContextMenu.rematchRecipe', () => {
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ relaxed: false }),
});
- expect(showToastMock).toHaveBeenCalledWith(
+ // Non-noop runs open the summary modal instead of toasting.
+ expect(showToastMock).not.toHaveBeenCalledWith(
'toast.recipes.rematchComplete',
- { rematched: 2, skipped: 0, total: 1, entries: 2, recipes: 1, failures: 0 },
- 'success'
+ expect.anything(),
+ expect.anything()
);
expect(showToastMock).not.toHaveBeenCalledWith(
'toast.recipes.rematchSkipped',
expect.anything(),
expect.anything()
);
+ const summaryModal = document.getElementById('rematchSummaryModal');
+ expect(summaryModal).not.toBeNull();
+ expect(summaryModal.querySelector('.summary-header').classList.contains('success')).toBe(true);
+ expect(summaryModal.querySelector('.stat-card-success .stat-card-value').textContent).toBe('2');
+ expect(summaryModal.querySelector('.stat-card-failure .stat-card-value').textContent).toBe('0');
expect(global.fetch).toHaveBeenNthCalledWith(2, '/api/lm/recipe/recipe-1');
expect(updateSingleItemMock).toHaveBeenCalledWith('/recipes/recipe-1.webp', {
id: 'recipe-1',
@@ -142,7 +141,7 @@ describe('RecipeContextMenu.rematchRecipe', () => {
});
});
- it('toasts an info message when the entries had no local match', async () => {
+ it('opens the summary modal when the entries had no local match', async () => {
const menu = await createMenu();
const card = document.getElementById('card');
menu.showMenu(100, 100, card);
@@ -160,11 +159,11 @@ describe('RecipeContextMenu.rematchRecipe', () => {
await confirmRematchOptions();
await flushAsyncTasks();
- expect(showToastMock).toHaveBeenCalledWith(
- 'toast.recipes.rematchUnmatched',
- { entries: 2, recipes: 1, total: 1 },
- 'info'
- );
+ const summaryModal = document.getElementById('rematchSummaryModal');
+ expect(summaryModal).not.toBeNull();
+ expect(summaryModal.querySelector('.summary-header').classList.contains('warning')).toBe(true);
+ expect(summaryModal.querySelector('.stat-card-success .stat-card-value').textContent).toBe('0');
+ expect(summaryModal.querySelector('.stat-card-total .stat-card-value').textContent).toBe('2');
expect(showToastMock).not.toHaveBeenCalledWith(
'toast.recipes.rematchSkipped',
expect.anything(),
@@ -303,7 +302,7 @@ describe('RecipeContextMenu.rematchRecipe', () => {
expect(global.fetch).not.toHaveBeenCalled();
});
- it('shows the results modal when the result carries l4_matches', async () => {
+ it('lists L4 filename matches in the summary modal with undo buttons', async () => {
const menu = await createMenu();
const card = document.getElementById('card');
menu.showMenu(100, 100, card);
@@ -321,11 +320,6 @@ describe('RecipeContextMenu.rematchRecipe', () => {
json: async () => ({ id: 'recipe-1', title: 'Updated Recipe' }),
});
- const rematchModalManager = await getRematchModalManager();
- const showResultsSpy = vi
- .spyOn(rematchModalManager, 'showResultsModal')
- .mockImplementation(() => {});
-
document
.querySelector('[data-action="rematch"]')
.dispatchEvent(new Event('click', { bubbles: true }));
@@ -334,7 +328,15 @@ describe('RecipeContextMenu.rematchRecipe', () => {
await confirmRematchOptions();
await flushAsyncTasks();
- expect(showResultsSpy).toHaveBeenCalledWith(l4Matches);
- showResultsSpy.mockRestore();
+ const summaryModal = document.getElementById('rematchSummaryModal');
+ expect(summaryModal).not.toBeNull();
+ // L4 matches to review force the warning header
+ expect(summaryModal.querySelector('.summary-header').classList.contains('warning')).toBe(true);
+ expect(summaryModal.querySelector('.stat-card-skipped .stat-card-value').textContent).toBe('1');
+ const rows = summaryModal.querySelectorAll('tr[data-l4-index]');
+ expect(rows).toHaveLength(1);
+ expect(rows[0].textContent).toContain('old.safetensors');
+ expect(rows[0].textContent).toContain('new.safetensors');
+ expect(rows[0].querySelector('.rematch-undo-btn[data-action="undo-match"][data-index="0"]')).not.toBeNull();
});
});
diff --git a/tests/frontend/managers/BulkManager.rematch.test.js b/tests/frontend/managers/BulkManager.rematch.test.js
index f33480f4..147dbade 100644
--- a/tests/frontend/managers/BulkManager.rematch.test.js
+++ b/tests/frontend/managers/BulkManager.rematch.test.js
@@ -95,6 +95,7 @@ describe('BulkManager.rematchSelectedRecipes', () => {
stateStub.currentPageType = 'recipes';
stateStub.bulkMode = false;
stateStub.selectedModels.clear();
+ document.body.innerHTML = '';
});
async function createBulkManager() {
@@ -107,9 +108,9 @@ describe('BulkManager.rematchSelectedRecipes', () => {
expect(bulk.actionConfig.recipes.rematchMetadata).toBe(true);
});
- // Oracle R4-F1 pin: the complete toast must branch on `rematched` — a blind
- // `repaired` mirror would fire the skipped toast with count 0 here.
- it('toasts the rematched count when the bulk rematch succeeds', async () => {
+ // Oracle R4-F1 pin: the summary modal must branch on `matched_entries` — a
+ // blind `repaired` mirror would render 0 matched entries here.
+ it('opens the summary modal when the bulk rematch succeeds', async () => {
const bulk = await createBulkManager();
stateStub.selectedModels.add('/recipes/a.webp');
stateStub.selectedModels.add('/recipes/b.webp');
@@ -140,23 +141,31 @@ describe('BulkManager.rematchSelectedRecipes', () => {
],
{ relaxed: false }
);
- expect(showToastMock).toHaveBeenCalledWith(
+ // Non-noop runs open the summary modal instead of toasting.
+ expect(showToastMock).not.toHaveBeenCalledWith(
'toast.recipes.rematchComplete',
- { rematched: 4, skipped: 1, total: 3, entries: 4, recipes: 2, failures: 0 },
- 'success'
+ expect.anything(),
+ expect.anything()
);
expect(showToastMock).not.toHaveBeenCalledWith(
'toast.recipes.rematchSkipped',
expect.anything(),
expect.anything()
);
+ const summaryModal = document.getElementById('rematchSummaryModal');
+ expect(summaryModal).not.toBeNull();
+ // unresolved_entries > 0 forces the warning header
+ expect(summaryModal.querySelector('.summary-header').classList.contains('warning')).toBe(true);
+ expect(summaryModal.querySelector('.stat-card-success .stat-card-value').textContent).toBe('4');
+ expect(summaryModal.querySelector('.stat-card-total .stat-card-value').textContent).toBe('1');
+ expect(summaryModal.querySelector('.stat-card-failure .stat-card-value').textContent).toBe('0');
expect(updateSingleItemMock).toHaveBeenCalledWith('/recipes/a.webp', rematchedRecipe);
expect(loadingManagerStub.showSimpleLoading).toHaveBeenCalled();
expect(loadingManagerStub.hide).toHaveBeenCalled();
expect(loadingManagerStub.restoreProgressBar).toHaveBeenCalled();
});
- it('uses the errors toast variant when the bulk rematch has failures', async () => {
+ it('opens the summary modal with a warning header when the bulk rematch has failures', async () => {
const bulk = await createBulkManager();
stateStub.selectedModels.add('/recipes/a.webp');
stateStub.selectedModels.add('/recipes/b.webp');
@@ -177,14 +186,14 @@ describe('BulkManager.rematchSelectedRecipes', () => {
await bulk.rematchSelectedRecipes();
await confirmRematchOptions();
- expect(showToastMock).toHaveBeenCalledWith(
- 'toast.recipes.rematchCompleteErrors',
- { rematched: 3, skipped: 0, total: 2, entries: 3, recipes: 1, failures: 2 },
- 'warning'
- );
+ const summaryModal = document.getElementById('rematchSummaryModal');
+ expect(summaryModal).not.toBeNull();
+ expect(summaryModal.querySelector('.summary-header').classList.contains('warning')).toBe(true);
+ expect(summaryModal.querySelector('.stat-card-success .stat-card-value').textContent).toBe('3');
+ expect(summaryModal.querySelector('.stat-card-failure .stat-card-value').textContent).toBe('2');
});
- it('toasts an error when every selected recipe failed to rematch', async () => {
+ it('opens the summary modal with an error header when every selected recipe failed to rematch', async () => {
const bulk = await createBulkManager();
stateStub.selectedModels.add('/recipes/a.webp');
stateStub.selectedModels.add('/recipes/b.webp');
@@ -205,11 +214,10 @@ describe('BulkManager.rematchSelectedRecipes', () => {
await bulk.rematchSelectedRecipes();
await confirmRematchOptions();
- expect(showToastMock).toHaveBeenCalledWith(
- 'toast.recipes.rematchAllFailed',
- { total: 2, failures: 2 },
- 'error'
- );
+ const summaryModal = document.getElementById('rematchSummaryModal');
+ expect(summaryModal).not.toBeNull();
+ expect(summaryModal.querySelector('.summary-header').classList.contains('error')).toBe(true);
+ expect(summaryModal.querySelector('.stat-card-failure .stat-card-value').textContent).toBe('2');
expect(showToastMock).not.toHaveBeenCalledWith(
'toast.recipes.rematchSkipped',
expect.anything(),
@@ -217,7 +225,7 @@ describe('BulkManager.rematchSelectedRecipes', () => {
);
});
- it('toasts an info message when entries had no local match', async () => {
+ it('opens the summary modal when entries had no local match', async () => {
const bulk = await createBulkManager();
stateStub.selectedModels.add('/recipes/a.webp');
stateStub.selectedModels.add('/recipes/b.webp');
@@ -239,11 +247,11 @@ describe('BulkManager.rematchSelectedRecipes', () => {
await bulk.rematchSelectedRecipes();
await confirmRematchOptions();
- expect(showToastMock).toHaveBeenCalledWith(
- 'toast.recipes.rematchUnmatched',
- { entries: 2, recipes: 1, total: 3 },
- 'info'
- );
+ const summaryModal = document.getElementById('rematchSummaryModal');
+ expect(summaryModal).not.toBeNull();
+ expect(summaryModal.querySelector('.summary-header').classList.contains('warning')).toBe(true);
+ expect(summaryModal.querySelector('.stat-card-success .stat-card-value').textContent).toBe('0');
+ expect(summaryModal.querySelector('.stat-card-total .stat-card-value').textContent).toBe('2');
expect(showToastMock).not.toHaveBeenCalledWith(
'toast.recipes.rematchSkipped',
expect.anything(),
@@ -409,7 +417,7 @@ describe('BulkManager.rematchSelectedRecipes', () => {
);
});
- it('shows the L4 results modal when the bulk result carries l4_matches', async () => {
+ it('lists L4 filename matches in the summary modal with undo buttons', async () => {
const bulk = await createBulkManager();
stateStub.selectedModels.add('/recipes/a.webp');
@@ -428,17 +436,18 @@ describe('BulkManager.rematchSelectedRecipes', () => {
l4_matches: l4Matches,
});
- const { rematchModalManager } = await import(
- '../../../static/js/managers/RematchModalManager.js'
- );
- const showResultsSpy = vi
- .spyOn(rematchModalManager, 'showResultsModal')
- .mockImplementation(() => {});
-
await bulk.rematchSelectedRecipes();
await confirmRematchOptions();
- expect(showResultsSpy).toHaveBeenCalledWith(l4Matches);
- showResultsSpy.mockRestore();
+ const summaryModal = document.getElementById('rematchSummaryModal');
+ expect(summaryModal).not.toBeNull();
+ // L4 matches to review force the warning header
+ expect(summaryModal.querySelector('.summary-header').classList.contains('warning')).toBe(true);
+ expect(summaryModal.querySelector('.stat-card-skipped .stat-card-value').textContent).toBe('1');
+ const rows = summaryModal.querySelectorAll('tr[data-l4-index]');
+ expect(rows).toHaveLength(1);
+ expect(rows[0].textContent).toContain('old.safetensors');
+ expect(rows[0].textContent).toContain('new.safetensors');
+ expect(rows[0].querySelector('.rematch-undo-btn[data-action="undo-match"][data-index="0"]')).not.toBeNull();
});
});
diff --git a/tests/frontend/managers/RematchModalManager.test.js b/tests/frontend/managers/RematchModalManager.test.js
index 6b3292eb..e0e2ca0e 100644
--- a/tests/frontend/managers/RematchModalManager.test.js
+++ b/tests/frontend/managers/RematchModalManager.test.js
@@ -116,111 +116,3 @@ describe('RematchModalManager options dialog', () => {
});
});
-describe('RematchModalManager results modal', () => {
- beforeEach(() => {
- vi.clearAllMocks();
- document.body.innerHTML = '