mirror of
https://github.com/4gray/iptvnator.git
synced 2026-10-15 05:36:17 -08:00
fix(ui): destructive confirmations, verb labels and provider icons
Confirmations: ConfirmDialogData.confirmLabel is required, so no dialog can
fall back to "Yes"/"No"; the dismiss defaults to "Cancel" and
`tone: 'destructive'` styles the confirm with .app-destructive-button. Every
caller names its action ("Remove playlist", "Clear", "Refresh playlist",
"Cancel download" with a "Close" dismiss). The confirm button has the
confirm-dialog-confirm test id and drops its no-op color="primary".
The no-op `warn` color input becomes .app-destructive-button on the EPG
mapping, playlist item, error view, EPG/reset settings, delete-all and source
cleanup buttons, and on the unsaved-changes dialog's Discard.
Provider icons come from SOURCE_TYPE_ICONS in shared/interfaces (Xtream
cloud, Stalker cast, M3U playlist_play / link / description / subject) in the
add dialog, auto-import, empty state, playlist switcher, playlist rows,
dashboard source rail, command palette, Sources filters and both reset
summaries. Stalker no longer borrows the Dashboard icon, and Xtream no longer
shares a glyph with M3U URL playlists.
The playlist error view removed a playlist through the stale
PlaylistActions.removePlaylist: it dropped the playlist from state before the
delete ran, swallowed failures, skipped the source activity guard and showed
no toast. It now uses PlaylistDeleteActionService like every other removal,
commits only a completed delete, toasts and goes home. The unused action and
its effect are removed.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
572034f3be
commit
082c56608b
50 files changed
+584
-103
No files matched your search
@@ -551,7 +551,9 @@ async function refreshFromWorkspaceHeader(page: Page): Promise<void> {
|
||||
|
||||
const dialog = page.locator('mat-dialog-container');
|
||||
await expect(dialog).toBeVisible();
|
||||
await dialog.getByRole('button', { name: 'Yes', exact: true }).click();
|
||||
await dialog
|
||||
.getByRole('button', { name: 'Refresh playlist', exact: true })
|
||||
.click();
|
||||
|
||||
const refreshOverlay = page.locator('app-workspace-shell-import-overlay');
|
||||
await expect(refreshOverlay).toBeVisible({ timeout: 5000 });
|
||||
|
||||
@@ -1266,7 +1266,7 @@ export async function clearCurrentUnifiedCollection(page: Page): Promise<void> {
|
||||
|
||||
const dialog = page.locator('mat-dialog-container').last();
|
||||
await expect(dialog).toBeVisible();
|
||||
await dialog.getByRole('button', { name: /^Yes$/i }).click();
|
||||
await dialog.getByRole('button', { name: 'Clear', exact: true }).click();
|
||||
await expect(dialog).toBeHidden();
|
||||
}
|
||||
|
||||
@@ -1664,7 +1664,7 @@ export async function deleteSource(page: Page, title: string): Promise<void> {
|
||||
|
||||
await expect(row).toBeVisible();
|
||||
await row.locator('.delete-btn').click();
|
||||
await confirmDialog(page);
|
||||
await confirmDialog(page, 'Remove playlist');
|
||||
}
|
||||
|
||||
export async function refreshSource(
|
||||
@@ -1681,7 +1681,7 @@ export async function refreshSource(
|
||||
await row.locator('.refresh-btn').click();
|
||||
|
||||
if (confirm) {
|
||||
await confirmDialog(page);
|
||||
await confirmDialog(page, 'Refresh playlist');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2098,7 +2098,7 @@ async function openCommandPalette(page: Page): Promise<Locator> {
|
||||
return dialog;
|
||||
}
|
||||
|
||||
async function confirmDialog(page: Page, buttonLabel = 'Yes'): Promise<void> {
|
||||
async function confirmDialog(page: Page, buttonLabel: string): Promise<void> {
|
||||
const dialog = page.locator('mat-dialog-container');
|
||||
|
||||
await expect(dialog).toBeVisible();
|
||||
|
||||
@@ -163,7 +163,10 @@ test.describe('Live channel rail collapse (#1458)', () => {
|
||||
await app.mainWindow
|
||||
.getByRole('button', { name: 'Clear recently viewed Live TV' })
|
||||
.click();
|
||||
await app.mainWindow.getByRole('button', { name: 'Yes' }).click();
|
||||
await app.mainWindow
|
||||
.locator('mat-dialog-container')
|
||||
.getByRole('button', { name: 'Clear', exact: true })
|
||||
.click();
|
||||
await expect(
|
||||
channelItemByTitle(app.mainWindow, 'Channel Alpha')
|
||||
).toHaveCount(0);
|
||||
|
||||
@@ -35,7 +35,8 @@ describe('Xtream scenario driver source wiring', () => {
|
||||
"'app-playlist-item'",
|
||||
"'.refresh-btn'",
|
||||
"'.delete-btn'",
|
||||
"'Yes'",
|
||||
"'Refresh playlist'",
|
||||
"'Remove playlist'",
|
||||
"'.busy-state__message'",
|
||||
"'.action-spinner'",
|
||||
"'.cancel-btn'",
|
||||
|
||||
@@ -157,10 +157,15 @@ describe('Xtream Playwright scenario driver', () => {
|
||||
});
|
||||
|
||||
it('does not require a misleading portal-status badge before refresh or delete', async () => {
|
||||
for (const [scenarioId, selector] of [
|
||||
[XTREAM_SCENARIO_ID.REFRESH_LARGE, '.refresh-btn'],
|
||||
[XTREAM_SCENARIO_ID.DELETE_LARGE, '.delete-btn'],
|
||||
for (const [scenarioId, selector, confirmLabel] of [
|
||||
[
|
||||
XTREAM_SCENARIO_ID.REFRESH_LARGE,
|
||||
'.refresh-btn',
|
||||
'Refresh playlist',
|
||||
],
|
||||
[XTREAM_SCENARIO_ID.DELETE_LARGE, '.delete-btn', 'Remove playlist'],
|
||||
] as const) {
|
||||
const confirmClick = `name=${confirmLabel};exact=true`;
|
||||
const fake = new FakePage();
|
||||
const prepared = await prepareXtreamScenario(
|
||||
fake.asPage(),
|
||||
@@ -168,7 +173,7 @@ describe('Xtream Playwright scenario driver', () => {
|
||||
);
|
||||
|
||||
assert.equal(fake.clicksMatching(selector), 1);
|
||||
assert.equal(fake.clicksMatching('name=Yes;exact=true'), 0);
|
||||
assert.equal(fake.clicksMatching(confirmClick), 0);
|
||||
const portalReadyIndex = fake.log.findIndex((entry) =>
|
||||
entry.includes('[aria-label="Portal status: active"]:visible')
|
||||
);
|
||||
@@ -179,7 +184,7 @@ describe('Xtream Playwright scenario driver', () => {
|
||||
assert.equal(portalReadyIndex, -1);
|
||||
assert.ok(sourceActionIndex >= 0);
|
||||
await prepared.trigger();
|
||||
assert.equal(fake.clicksMatching('name=Yes;exact=true'), 1);
|
||||
assert.equal(fake.clicksMatching(confirmClick), 1);
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
@@ -83,7 +83,10 @@ export async function prepareXtreamSourceActionTrigger(
|
||||
const dialog = page.locator('mat-dialog-container').last();
|
||||
await dialog.waitFor({ state: 'visible' });
|
||||
const confirmation = dialog
|
||||
.getByRole('button', { name: 'Yes', exact: true })
|
||||
.getByRole('button', {
|
||||
name: action === 'refresh' ? 'Refresh playlist' : 'Remove playlist',
|
||||
exact: true,
|
||||
})
|
||||
.last();
|
||||
await assertTriggerReady(confirmation, `xtream-source-${action}-confirm`);
|
||||
return confirmation;
|
||||
|
||||
@@ -245,7 +245,9 @@ async function refreshRecentXtreamSourceFromDashboard(
|
||||
|
||||
const dialog = page.locator('mat-dialog-container');
|
||||
await expect(dialog).toBeVisible();
|
||||
await dialog.getByRole('button', { name: 'Yes', exact: true }).click();
|
||||
await dialog
|
||||
.getByRole('button', { name: 'Refresh playlist', exact: true })
|
||||
.click();
|
||||
|
||||
const refreshOverlay = page.locator('app-workspace-shell-import-overlay');
|
||||
await expect(refreshOverlay).toBeVisible({ timeout: 5000 });
|
||||
|
||||
@@ -676,7 +676,10 @@ async function clearRecentItems(page: Page, typeLabel: string): Promise<void> {
|
||||
await page
|
||||
.getByRole('button', { name: `Clear recently viewed ${typeLabel}` })
|
||||
.click();
|
||||
await page.getByRole('button', { name: 'Yes' }).click();
|
||||
await page
|
||||
.locator('mat-dialog-container')
|
||||
.getByRole('button', { name: 'Clear', exact: true })
|
||||
.click();
|
||||
}
|
||||
|
||||
async function expectUnifiedLiveDetailOpen(
|
||||
|
||||
@@ -4,6 +4,7 @@ import {
|
||||
expect,
|
||||
launchElectronApp,
|
||||
openSettings,
|
||||
openSettingsSection,
|
||||
test,
|
||||
} from './electron-test-fixtures';
|
||||
import { applyTheme } from './theme-contrast';
|
||||
@@ -193,4 +194,55 @@ test.describe('Theme tokens', () => {
|
||||
await closeElectronApp(app);
|
||||
}
|
||||
});
|
||||
|
||||
test('@theme @electron destructive actions name the action and use the error color', async ({
|
||||
dataDir,
|
||||
}) => {
|
||||
const app = await launchElectronApp(dataDir);
|
||||
const page = app.mainWindow;
|
||||
try {
|
||||
await openSettings(page);
|
||||
await openSettingsSection(page, 'epg');
|
||||
|
||||
for (const theme of ['light', 'dark'] as const) {
|
||||
await applyTheme(page, theme);
|
||||
const error = await resolveColor(page, 'var(--mat-sys-error)');
|
||||
const trigger = page.getByRole('button', {
|
||||
name: 'Clear EPG data',
|
||||
exact: true,
|
||||
});
|
||||
// The `warn` color input was a no-op with M3: the trigger
|
||||
// rendered in the primary color.
|
||||
await expect
|
||||
.poll(() =>
|
||||
trigger.evaluate((el) => getComputedStyle(el).color)
|
||||
)
|
||||
.toBe(error);
|
||||
await trigger.click();
|
||||
|
||||
const dialog = page.locator('mat-dialog-container');
|
||||
await expect(dialog).toBeVisible();
|
||||
await expect(
|
||||
dialog.getByRole('button', { name: 'Yes' })
|
||||
).toHaveCount(0);
|
||||
const confirm = dialog.getByTestId('confirm-dialog-confirm');
|
||||
await expect(confirm).toHaveText('Clear EPG data');
|
||||
await expect(confirm).toHaveClass(/app-destructive-button/);
|
||||
await expect
|
||||
.poll(() =>
|
||||
confirm.evaluate(
|
||||
(el) => getComputedStyle(el).backgroundColor
|
||||
)
|
||||
)
|
||||
.toBe(error);
|
||||
|
||||
await dialog
|
||||
.getByRole('button', { name: 'Cancel', exact: true })
|
||||
.click();
|
||||
await expect(dialog).toBeHidden();
|
||||
}
|
||||
} finally {
|
||||
await closeElectronApp(app);
|
||||
}
|
||||
});
|
||||
});
|
||||
@@ -292,7 +292,7 @@ test.describe('Electron Xtream Responsiveness', () => {
|
||||
);
|
||||
await expect(confirmDialog).toBeVisible();
|
||||
await confirmDialog
|
||||
.getByRole('button', { name: 'Yes', exact: true })
|
||||
.getByRole('button', { name: 'Remove playlist', exact: true })
|
||||
.click();
|
||||
|
||||
await waitForDbOperationEvent(app.mainWindow, {
|
||||
|
||||
Reference in new issue
Block a user