mirror of
https://github.com/johannesjo/super-productivity.git
synced 2026-07-18 00:46:45 +00:00
* fix(issue): prevent crash from orphan issueProviderId (#7135) The Jira image-headers effect in task-detail-panel subscribed to selectIssueProviderById without an error handler, so a task with an issueProviderId pointing at a deleted provider (e.g. after sync convergence where taskIdsToUnlink didn't cover all local tasks) propagated the selector throw to Zone.js as a crash dialog. Wrap the inner selector observable in catchError that logs and falls back to of(null); the downstream jiraCfg?.isEnabled guard handles the fallback. Also drop IssueLog.log(issueProviderKey, issueProvider) from the throwing variant of the selector: providers may carry credentials (host, token, apiKey) and IssueLog history is exportable. * fix(focus-mode): sync tray countdown with in-app timer during breaks Tray title was rebuilt from a cached currentFocusSessionTime that only refreshed when CURRENT_TASK_UPDATED fired. addTimeSpent is gated on an active current task, so during focus-mode breaks or task-less focus sessions the cache froze while the in-app timer kept ticking. Add the tick action to taskChangeElectron$ so the cache refreshes every second whenever the focus timer is running. Fixes #7278 * fix(ci): restore GitHub Actions SHA pins undone by0e9218bd68Commit0e9218bd68silently reverted PR #7212 (github-actions-minor group bump) along with its stated sync/client-id work. This restores the 15 workflow files to their pre-revert state. Actions restored to newer pinned SHAs: - actions/upload-artifact v7.0.0 -> v7.0.1 - step-security/harden-runner v2.16.1 -> v2.17.0 - softprops/action-gh-release v2.6.1 -> v3.0.0 - signpath/github-action-submit-signing-request v2.0 -> v2.1 - anthropics/claude-code-action v1.0.89 -> v1.0.93 - docker/build-push-action v7.0.0 -> v7.1.0 - easingthemes/ssh-deploy v5.1.1 -> v6.0.3 * fix: restore i18n, UI, and docs work undone by0e9218bd68Commit0e9218bd68silently reverted the following work alongside its stated sync/client-id changes. Files where later master commits (fec7b25f23, etc.) already re-applied the reverted work are intentionally left untouched. Restored: - #7232 docs/long-term-plans/location-based-reminders.md (513 lines) - #7199 Romanian i18n phase 3 (ro.json + ro-md.json, ~1168 lines) - #7049 Polish translation improvements - #7143 planner component styling (4 scss files) - #7211 add-task-bar preserve time estimate when typing title - #7208 task.reducer roll-up estimates for added subtasks - #6767 focus-mode pomodoro reset button - #7205 plugin-dev github-issue-provider TOKEN description - #7231 mobile-bottom-nav FAB fix -a4fe03272iOS keyboard accessory bar (global-theme + dialog-fullscreen-markdown) -309670db3ShortSyntaxEffects undefined guard -667a7986fDropbox PKCE auth comment/behavior * fix(electron): restore electron + e2e work undone by0e9218bd68Commit0e9218bd68silently reverted the following electron/e2e work. Files already re-fixed by later master commits are left as-is: - e2e/tests/sync/supersync-archive-conflict.spec.ts (de33234976+191d129ff3) Restored: -e8a3e156ebfix(electron): Linux autostart IDB backing-store recovery (re-adds electron/clear-stale-idb-locks.ts + start-app.ts wiring) -5ce78a5b63fix(electron): macOS Cmd+Q / Dock > Quit hang (setIsQuiting + before-quit delegate to close-handler) -46e0fa2d01fix(sync): FILE_SYNC_LIST_FILES IPC contract (electronAPI.d.ts + local-file-sync + preload + ipc-events) -ea1ef16307fix(android): session-only SAF permissions on OEM devices -8865dc0a50test(e2e): supersync parallel-worker stampede guard (SUPERSYNC_SERVER_HEALTHY env-var fallback + goto retry loop) -af7c7687e2test(e2e): block WS-triggered downloads in non-WS specs -265b44db5dtest(e2e): premature waitForURL on daily-summary (this is literally the fix the bad commit's message claimed to add) Conflict resolutions: - e2e/utils/supersync-helpers.ts: kept the refined getDoneTaskElement checks fromd64014d086(later thanc558bcab5e) while restoring the goto retry loop from8865dc0a50. - electron/start-app.ts: unioned imports (setIsQuiting + clearStaleLevelDbLocks from theirs, fs from ours). * fix(sync): restore sync-core work undone by0e9218bd68Commit0e9218bd68silently reverted parts of several sync fixes. Most sync-core reverts have already been re-addressed differently on master by later commits (1f5184f6e7,05cd875dd6,09f5ced2c9,7df43358ab,d9158d6adb,32dbc95ed9,8c3b08e016,f89fe1ebc3) — those files are intentionally left untouched to avoid reverting master's newer work. This PR restores only the pieces that are genuinely still missing: -e8a3e156ebfix(electron): IDB backing-store autoreload (in-app piece) operation-log-hydrator.service.ts + .spec.ts (the electron/clear- stale-idb-locks.ts piece was restored in the prior commit) Plus three low-risk documentation/cleanup restorations: - operation-sync.util.ts — add "Nextcloud" to isFileBasedProvider JSDoc - dropbox.ts — restore improved _getRedirectUri JSDoc (667a7986fb) - dialog-get-and-enter-auth-code.component.ts — restore isNativePlatform comment explaining why manual code entry flow is used (667a7986fb) - file-adapter.interface.ts — remove stray "// NEW" comment (46e0fa2d01) Intentionally NOT restored (master's newer work covers or supersedes): - sync-trigger.service.ts / sync.effects.ts (05cd875dd6) - sync-wrapper.service.ts (1f5184f6e7) - sync-errors.ts (1f5184f6e7re-added LegacySyncFormatDetectedError) - file-based-sync-adapter.service.ts + spec (1f5184f6e7+d9158d6adb) - file-based-sync.types.ts (1f5184f6e7) - operation-log.const.ts (32dbc95ed9bumped IDB_OPEN_RETRIES to 5) - dialog-sync-initial-cfg.component.ts (f89fe1ebc3)
89 lines
3.4 KiB
TypeScript
89 lines
3.4 KiB
TypeScript
import { FullConfig } from '@playwright/test';
|
|
import { execSync } from 'child_process';
|
|
import * as fs from 'fs';
|
|
import * as path from 'path';
|
|
import { isServerHealthy } from './utils/supersync-helpers';
|
|
|
|
/**
|
|
* Warm up the dev server by fetching the app once before any tests start.
|
|
* This ensures Angular compilation is complete and cached, so all workers
|
|
* get instant responses instead of competing for the first compilation.
|
|
*/
|
|
const warmUpDevServer = async (baseURL: string): Promise<void> => {
|
|
console.log(`Warming up dev server at ${baseURL}...`);
|
|
const maxRetries = 3;
|
|
for (let attempt = 0; attempt < maxRetries; attempt++) {
|
|
try {
|
|
const response = await fetch(baseURL, { signal: AbortSignal.timeout(30000) });
|
|
if (response.ok) {
|
|
// Read the full body to ensure the server finishes compilation
|
|
await response.text();
|
|
console.log('Dev server warm-up complete');
|
|
return;
|
|
}
|
|
} catch {
|
|
if (attempt < maxRetries - 1) {
|
|
console.log(`Warm-up attempt ${attempt + 1} failed, retrying...`);
|
|
await new Promise((r) => setTimeout(r, 2000));
|
|
}
|
|
}
|
|
}
|
|
console.warn('Dev server warm-up failed — tests may be slow on first run');
|
|
};
|
|
|
|
const globalSetup = async (config: FullConfig): Promise<void> => {
|
|
// Set test environment variables
|
|
process.env.TZ = 'Europe/Berlin';
|
|
process.env.NODE_ENV = 'test';
|
|
console.log(`Running tests with ${config.workers} workers`);
|
|
|
|
// Build plugins before starting tests (skip if already built)
|
|
// Check both the dev path (src/assets/) and the CI pre-built path (.tmp/angular-dist/)
|
|
const pluginManifestPath = path.join(
|
|
process.cwd(),
|
|
'src/assets/bundled-plugins/api-test-plugin/manifest.json',
|
|
);
|
|
const ciBuildManifestPath = path.join(
|
|
process.cwd(),
|
|
'.tmp/angular-dist/browser/assets/bundled-plugins/api-test-plugin/manifest.json',
|
|
);
|
|
|
|
if (fs.existsSync(pluginManifestPath) || fs.existsSync(ciBuildManifestPath)) {
|
|
console.log('Plugins already built, skipping...');
|
|
} else {
|
|
console.log('Building bundled plugins...');
|
|
try {
|
|
execSync('npm run plugins:build', {
|
|
stdio: 'inherit',
|
|
cwd: process.cwd(),
|
|
});
|
|
console.log('Bundled plugins built successfully');
|
|
} catch (error) {
|
|
console.error('Failed to build plugins:', error);
|
|
throw error; // Fail fast if plugin build fails
|
|
}
|
|
}
|
|
|
|
// Warm up the dev server to pre-compile Angular bundles before workers start
|
|
const baseURL =
|
|
process.env.E2E_BASE_URL ||
|
|
config.projects[0]?.use?.baseURL ||
|
|
'http://localhost:4242';
|
|
await warmUpDevServer(baseURL);
|
|
|
|
// Check SuperSync server health ONCE here, before workers start.
|
|
// Without this, each worker checks independently on startup — with many workers
|
|
// running simultaneously, the concurrent health-check requests can overload the
|
|
// supersync server and cause false negatives, making workers skip all their tests.
|
|
// By storing the result in an env var set before workers are forked, every worker
|
|
// reads the cached result instantly instead of making HTTP requests.
|
|
const healthy = await isServerHealthy().catch(() => false);
|
|
process.env.SUPERSYNC_SERVER_HEALTHY = healthy ? 'true' : 'false';
|
|
if (healthy) {
|
|
console.log('SuperSync server healthy — supersync tests will run');
|
|
} else {
|
|
console.log('SuperSync server not available — supersync tests will be skipped');
|
|
}
|
|
};
|
|
|
|
export default globalSetup;
|