plum-e2e 2.8.6 → 2.9.0

package/frontend/src/routes/settings/+page.svelte

@@ -18,6 +18,8 @@
 		saveBackupConfig,
 		testBackupS3,
 		runBackupNow,
+		fetchS3Backups,
+		restoreFromS3,
 		fetchMcpConfig,
 		generateMcpKey as generateMcpKeyApi
 	} from '$lib/api/settings';
@@ -214,8 +216,10 @@
 		IMPORT_BLOCK_TITLE,
 		IMPORT_BLOCK_DESC,
 		CHOOSE_FILE_LABEL,
-		BACKUP_DISCLAIMER_PREFIX,
-		BACKUP_DISCLAIMER_SUFFIX,
+		INCLUDE_REPORTS_LABEL,
+		INCLUDE_REPORTS_HINT,
+		includeReportsDisclaimer,
+		saveIncludeReportsLabel,
 		S3_STORAGE_CARD_TITLE,
 		S3_STORAGE_DESC_PREFIX,
 		ENDPOINT_URL_LABEL,
@@ -240,6 +244,15 @@
 		S3_CONNECTION_FAILED,
 		BACKUP_CONFIG_SAVED_TOAST,
 		BACKUP_CONFIG_SAVE_FAILED,
+		RESTORE_FROM_S3_CARD_TITLE,
+		RESTORE_FROM_S3_DESC,
+		CONFIGURE_S3_FIRST_RESTORE_MESSAGE,
+		NO_S3_BACKUPS_MESSAGE,
+		RESTORE_CONFIRM_TITLE,
+		restoreConfirmBody,
+		RESTORE_SUCCESS_TOAST,
+		RESTORE_FAILED_FALLBACK,
+		LIST_S3_BACKUPS_FAILED,
 		SCHEDULED_BACKUP_CARD_TITLE,
 		CONFIGURE_S3_FIRST_MESSAGE,
 		ENABLE_SCHEDULED_BACKUP_LABEL,
@@ -264,7 +277,10 @@
 		saveS3ConfigLabel,
 		uploadedToLabel,
 		uploadS3NowLabel,
-		saveScheduleLabel
+		saveScheduleLabel,
+		restoreLabel,
+		refreshingLabel,
+		backupSizeLabel
 	} from '$lib/copy/settings';
 
 	/** @type {'project' | 'runners' | 'repository' | 'integrations' | 'mcp' | 'account' | 'users' | 'backup'} */
@@ -335,9 +351,11 @@
 		backupS3Bucket: '',
 		backupS3AccessKey: '',
 		backupS3SecretKey: '',
-		backupS3Prefix: ''
+		backupS3Prefix: '',
+		backupIncludeReports: false
 	};
 	let backupConfigSaving = false;
+	let includeReportsSaving = false;
 	let backupS3SecretKeySet = false;
 	let backupTestingS3 = false;
 	let backupRunningNow = false;
@@ -346,6 +364,13 @@
 	let backupLastRunAt = null;
 	let backupLastStatus = '';
 
+	let s3Backups = [];
+	let s3BackupsLoaded = false;
+	let loadingS3Backups = false;
+	let restoringKey = null;
+	let restoreConfirmOpen = false;
+	let restoreTarget = null;
+
 	let runners = [];
 	let runnerForm = { name: '', url: '', token: '', browser: 'chromium' };
 	let runnerFormError = '';
@@ -406,7 +431,8 @@
 				backupS3Bucket: bc.backupS3Bucket,
 				backupS3AccessKey: bc.backupS3AccessKey,
 				backupS3SecretKey: '',
-				backupS3Prefix: bc.backupS3Prefix
+				backupS3Prefix: bc.backupS3Prefix,
+				backupIncludeReports: bc.backupIncludeReports
 			};
 		} catch {}
 		if ($auth.user) {
@@ -802,6 +828,23 @@
 		}
 	}
 
+	async function handleSaveIncludeReports() {
+		includeReportsSaving = true;
+		try {
+			const payload = { ...backupConfig };
+			if (!payload.backupS3SecretKey) delete payload.backupS3SecretKey;
+			const result = await saveBackupConfig(payload);
+			if (result.error) throw new Error(result.error);
+			if (backupConfig.backupS3SecretKey) backupS3SecretKeySet = true;
+			backupConfig = { ...backupConfig, backupS3SecretKey: '' };
+			showToast('success', BACKUP_CONFIG_SAVED_TOAST);
+		} catch (e) {
+			showToast('error', e.message || BACKUP_CONFIG_SAVE_FAILED);
+		} finally {
+			includeReportsSaving = false;
+		}
+	}
+
 	async function handleTestS3() {
 		backupTestingS3 = true;
 		backupS3TestResult = null;
@@ -845,6 +888,48 @@
 		backupS3SecretKeySet
 	);
 
+	// Fetch the list once, the first time S3 looks configured — the Refresh
+	// button covers reloading after a new upload or a bucket/prefix change.
+	$: if (s3Configured && !s3BackupsLoaded) {
+		s3BackupsLoaded = true;
+		loadS3Backups();
+	}
+
+	async function loadS3Backups() {
+		loadingS3Backups = true;
+		try {
+			const result = await fetchS3Backups();
+			if (result.error) throw new Error(result.error);
+			s3Backups = result.backups ?? [];
+		} catch (e) {
+			showToast('error', e.message || LIST_S3_BACKUPS_FAILED);
+		} finally {
+			loadingS3Backups = false;
+		}
+	}
+
+	function openRestoreConfirm(backup) {
+		restoreTarget = backup;
+		restoreConfirmOpen = true;
+	}
+
+	async function handleRestoreFromS3() {
+		if (!restoreTarget) return;
+		restoringKey = restoreTarget.key;
+		try {
+			const result = await restoreFromS3(restoreTarget.key);
+			if (result.error) throw new Error(result.error);
+			showToast('success', RESTORE_SUCCESS_TOAST);
+			project = await fetchProject();
+			restoreConfirmOpen = false;
+			restoreTarget = null;
+		} catch (e) {
+			showToast('error', e.message || RESTORE_FAILED_FALLBACK);
+		} finally {
+			restoringKey = null;
+		}
+	}
+
 	$: mcpConfigSnippet = JSON.stringify(
 		{
 			mcpServers: {
@@ -1822,10 +1907,36 @@
 							</div>
 						</div>
 					</div>
+
+					<div class="include-reports-row">
+						<label class="field-label backup-toggle-label" for="include-reports">
+							<span>
+								{INCLUDE_REPORTS_LABEL}
+								<span class="field-hint">{INCLUDE_REPORTS_HINT}</span>
+							</span>
+							<button
+								id="include-reports"
+								class="toggle-btn"
+								class:active={backupConfig.backupIncludeReports}
+								on:click={() =>
+									(backupConfig.backupIncludeReports = !backupConfig.backupIncludeReports)}
+								role="switch"
+								aria-checked={backupConfig.backupIncludeReports}
+							>
+								<span class="toggle-thumb"></span>
+							</button>
+						</label>
+						<Button
+							variant="ghost"
+							on:click={handleSaveIncludeReports}
+							disabled={includeReportsSaving}
+						>
+							{saveIncludeReportsLabel(includeReportsSaving)}
+						</Button>
+					</div>
+
 					<p class="backup-disclaimer">
-						{BACKUP_DISCLAIMER_PREFIX}
-						<code>pg_dump</code>
-						{BACKUP_DISCLAIMER_SUFFIX}
+						{includeReportsDisclaimer(backupConfig.backupIncludeReports)}
 					</p>
 				</div>
 
@@ -1947,6 +2058,64 @@
 					{/if}
 				</div>
 
+				<!-- Restore from S3 -->
+				<ConfirmModal
+					bind:open={restoreConfirmOpen}
+					title={RESTORE_CONFIRM_TITLE}
+					confirmLabel={restoreLabel(false)}
+					loading={!!restoringKey}
+					on:confirm={handleRestoreFromS3}
+				>
+					{#if restoreTarget}
+						{restoreConfirmBody(restoreTarget.key)}
+					{/if}
+				</ConfirmModal>
+
+				<div class="card settings-card" class:card-disabled={!s3Configured}>
+					<div class="card-title-row">
+						<p class="card-title">{RESTORE_FROM_S3_CARD_TITLE}</p>
+						{#if s3Configured}
+							<Button variant="ghost" on:click={loadS3Backups} disabled={loadingS3Backups}>
+								{refreshingLabel(loadingS3Backups)}
+							</Button>
+						{/if}
+					</div>
+
+					{#if !s3Configured}
+						<p class="backup-block-desc">{CONFIGURE_S3_FIRST_RESTORE_MESSAGE}</p>
+					{:else}
+						<p class="backup-block-desc" style="margin-bottom: 1rem;">{RESTORE_FROM_S3_DESC}</p>
+
+						{#if s3Backups.length === 0}
+							<p class="backup-block-desc">
+								{loadingS3Backups ? refreshingLabel(true) : NO_S3_BACKUPS_MESSAGE}
+							</p>
+						{:else}
+							<ul class="s3-backup-list">
+								{#each s3Backups as backup (backup.key)}
+									<li class="s3-backup-row">
+										<div class="s3-backup-info">
+											<span class="s3-backup-key">{backup.key}</span>
+											<span class="s3-backup-meta">
+												{new Date(backup.lastModified).toLocaleString()} · {backupSizeLabel(
+													backup.size
+												)}
+											</span>
+										</div>
+										<Button
+											variant="ghost"
+											on:click={() => openRestoreConfirm(backup)}
+											disabled={restoringKey === backup.key}
+										>
+											{restoreLabel(restoringKey === backup.key)}
+										</Button>
+									</li>
+								{/each}
+							</ul>
+						{/if}
+					{/if}
+				</div>
+
 				<!-- Scheduled backup -->
 				<div class="card settings-card" class:card-disabled={!s3Configured}>
 					<p class="card-title">{SCHEDULED_BACKUP_CARD_TITLE}</p>
@@ -2390,6 +2559,23 @@
 		border-radius: 3px;
 	}
 
+	.include-reports-row {
+		display: flex;
+		align-items: center;
+		gap: 1.25rem;
+		margin-top: 1.25rem;
+		padding-top: 1.25rem;
+		border-top: 1px solid var(--border);
+	}
+	.include-reports-row .backup-toggle-label {
+		flex: 1;
+	}
+	.include-reports-row .field-label > span {
+		display: flex;
+		flex-direction: column;
+		gap: 0.15rem;
+	}
+
 	.backup-disclaimer {
 		margin-top: 1rem;
 		padding: 0.625rem 0.875rem;
@@ -2422,6 +2608,58 @@
 		color: var(--fail);
 	}
 
+	.card-title-row {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		gap: 1rem;
+		margin-bottom: 0.75rem;
+	}
+	.card-title-row .card-title {
+		margin-bottom: 0;
+	}
+
+	.s3-backup-list {
+		display: flex;
+		flex-direction: column;
+		gap: 0.5rem;
+		list-style: none;
+		margin: 0;
+		padding: 0;
+	}
+
+	.s3-backup-row {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		gap: 1rem;
+		padding: 0.625rem 0.875rem;
+		background: var(--bg-subtle);
+		border: 1px solid var(--border);
+		border-radius: var(--radius-sm);
+	}
+
+	.s3-backup-info {
+		display: flex;
+		flex-direction: column;
+		gap: 0.2rem;
+		min-width: 0;
+	}
+
+	.s3-backup-key {
+		font-family: 'JetBrains Mono', monospace;
+		font-size: 0.8125rem;
+		color: var(--text);
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+
+	.s3-backup-meta {
+		font-size: 0.75rem;
+		color: var(--text-muted);
+	}
+
 	.backup-last-run {
 		font-size: 0.8125rem;
 		color: var(--text-muted);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "plum-e2e",
-	"version": "2.8.6",
+	"version": "2.9.0",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/silverlunah/plum.git"

package/backend/playwright.config.js

@@ -1,85 +0,0 @@
-/*
- * This file is part of Plum.
- * Licensed under the MIT License. See LICENSE file in the project root for details.
- */
-
-// @ts-check
-import { defineConfig, devices } from '@playwright/test';
-
-/**
- * Read environment variables from file.
- * https://github.com/motdotla/dotenv
- */
-import dotenv from 'dotenv';
-import path from 'path';
-dotenv.config({ path: path.resolve(__dirname, '.env') });
-
-/**
- * @see https://playwright.dev/docs/test-configuration
- */
-export default defineConfig({
-	testDir: './tests',
-	/* Run tests in files in parallel */
-	fullyParallel: true,
-	/* Fail the build on CI if you accidentally left test.only in the source code. */
-	forbidOnly: !!process.env.CI,
-	/* Retry on CI only */
-	retries: process.env.CI ? 2 : 0,
-	/* Opt out of parallel tests on CI. */
-	workers: process.env.CI ? 1 : undefined,
-	/* Reporter to use. See https://playwright.dev/docs/test-reporters */
-	reporter: 'html',
-	/* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
-	use: {
-		/* Base URL to use in actions like `await page.goto('/')`. */
-		// baseURL: 'http://127.0.0.1:3000',
-
-		/* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
-		trace: 'on-first-retry'
-	},
-
-	/* Configure projects for major browsers */
-	projects: [
-		{
-			name: 'chromium',
-			use: { ...devices['Desktop Chrome'] }
-		},
-
-		{
-			name: 'firefox',
-			use: { ...devices['Desktop Firefox'] }
-		},
-
-		{
-			name: 'webkit',
-			use: { ...devices['Desktop Safari'] }
-		}
-
-		/* Test against mobile viewports. */
-		// {
-		//   name: 'Mobile Chrome',
-		//   use: { ...devices['Pixel 5'] },
-		// },
-		// {
-		//   name: 'Mobile Safari',
-		//   use: { ...devices['iPhone 12'] },
-		// },
-
-		/* Test against branded browsers. */
-		// {
-		//   name: 'Microsoft Edge',
-		//   use: { ...devices['Desktop Edge'], channel: 'msedge' },
-		// },
-		// {
-		//   name: 'Google Chrome',
-		//   use: { ...devices['Desktop Chrome'], channel: 'chrome' },
-		// },
-	]
-
-	/* Run your local dev server before starting the tests */
-	// webServer: {
-	//   command: 'npm run start',
-	//   url: 'http://127.0.0.1:3000',
-	//   reuseExistingServer: !process.env.CI,
-	// },
-});