mirror of
https://github.com/johannesjo/super-productivity.git
synced 2026-07-19 01:17:31 +00:00
222fa4c8aa
* feat(sync): show banner when LWW discards a user content edit Auto-resolved LWW conflicts were only surfaced as a generic "N local/ remote wins" count snack, so a field-level edit silently dropped by last-write-wins (e.g. a title edit lost to a concurrent notes edit) was invisible to the user (#8694). Split the resolution outcome: routine self-healing (reschedule/repeat/ archive/done churn) keeps the quiet count snack, while a resolution that discarded a genuine content edit (task title/notes/subtasks/attachments) shows a dismissible banner naming the affected task(s). - New pure summarizeLwwResolutions() classifier in @sp/sync-core (inspects the losing side's changed fields; UPDATE only, so create/delete/move and scheduling churn stay routine). - Titles are HTML-escaped before the innerHTML banner (they come from synced remote data) and never logged. * fix(sync): correct + simplify LWW content-conflict notice (multi-review) Address multi-agent review of the previous commit: - CRITICAL: the classifier's multi-entity branch made the feature a no-op in production. Captured ops are always wrapped as { actionPayload, entityChanges: [] } and task edits never populate entityChanges (only time-tracking does), so a real title/notes edit was read as having no changed fields → classified routine → banner never fired. Fixed by dropping the branch and relying on extractUpdateChanges (which unwraps actionPayload), gated to UPDATE ops. Spec now uses the real wrapped payload shape so this can't regress. - Move the classifier out of the framework-agnostic @sp/sync-core package into the app (findLwwContentConflicts); it held app-specific TASK field names and was exported but unused. TASK-only, no generics/callback. - De-duplicate content conflicts per task (one task can yield several concurrent conflicts) so the banner never lists a title twice. - Direction-neutral wording ("Older edits may have been discarded") since the discarded side depends on which client won. - Use the banner's built-in dismiss button instead of a no-op action. - Consolidate escapeHtml: escapeHtmlAttr now re-exports the shared util. - Guard against a non-string title before trim(). * fix(sync): drop dead 'attachments' from LWW content fields (review) Second-review WARNING: attachments are edited via dedicated [TaskAttachment] actions with payload { taskId, taskAttachment }, never updateTask({ task: { changes: { attachments } } }), so extractUpdateChanges never surfaces an 'attachments' key — the entry could never match and falsely claimed coverage. Removed it (title/notes/subTaskIds are live) and added a guard test asserting a real attachment-action-shaped op is not flagged, so it isn't naively re-added. |
||
|---|---|---|
| .. | ||
| assets | ||
| 0.-Meta-Diataxis.md | ||
| 0.00-Wiki-Structure-and-Organization.md | ||
| 0.01-Style-Guide.md | ||
| 0.02-Wiki-QA-and-Maintenance.md | ||
| 1.00-Quickstarts.md | ||
| 1.01-First-Steps.md | ||
| 1.02-Configure-Data-Synchronization.md | ||
| 2.00-How_To.md | ||
| 2.01-Downloads and Install.md | ||
| 2.02-Restore-Data-From-Backup.md | ||
| 2.03-Add-Tasks.md | ||
| 2.04-Manage-Subtasks.md | ||
| 2.05-Manage-Scheduled-Tasks.md | ||
| 2.06-Manage-Repeating-Tasks.md | ||
| 2.07-Manage-Task-Integrations.md | ||
| 2.08-Choose-Sync-Backend.md | ||
| 2.09-Configure-Sync-Backend.md | ||
| 2.10-Configure-Obsidian-for-Wiki-Contributions.md | ||
| 2.11-Run-the-Development-Server.md | ||
| 2.12-Package-the-App.md | ||
| 2.13-Run-with-Docker.md | ||
| 2.14-Build-for-Android.md | ||
| 2.15-Develop-a-Plugin.md | ||
| 2.16-Set-Up-Development-Environment.md | ||
| 2.17-Add-a-New-Issue-Integration.md | ||
| 2.18-Contribute-Translations.md | ||
| 2.19-Sync-Proton-Drive-via-rclone.md | ||
| 3.00-Reference.md | ||
| 3.01-API.md | ||
| 3.02-Settings-and-Preferences.md | ||
| 3.03-Keyboard-Shortcuts.md | ||
| 3.04-Short-Syntax.md | ||
| 3.05-Web-App-vs-Desktop.md | ||
| 3.06-User-Data.md | ||
| 3.07-Issue-Integration-Comparison.md | ||
| 3.08-Sync-Integration-Comparison.md | ||
| 3.09-Theming.md | ||
| 3.97-Obsidian-Linter-Config-MD.md | ||
| 3.98-Obsidian-Linter-Config-YAML.md | ||
| 3.99-Other.md | ||
| 4.00-Concepts.md | ||
| 4.01-The-Today-View.md | ||
| 4.02-Inbox-View.md | ||
| 4.03-Planner-View.md | ||
| 4.04-Schedule-View.md | ||
| 4.05-Board-View.md | ||
| 4.06-Project-View.md | ||
| 4.07-Tag-View.md | ||
| 4.07a-Tags_Eat-the-Frog.md | ||
| 4.07b-Tags_Ordinal-Priorities.md | ||
| 4.08-Time-Estimates.md | ||
| 4.09-Task-Attributes.md | ||
| 4.10-Task-Notes.md | ||
| 4.11-Subtasks.md | ||
| 4.12-Scheduled-Tasks.md | ||
| 4.13-Repeating-Tasks.md | ||
| 4.14-How-Time-Is-Logged.md | ||
| 4.15-Timers-and-Focus-Mode.md | ||
| 4.16-Break-Reminders.md | ||
| 4.17-Idle-Time.md | ||
| 4.18-Reflection.md | ||
| 4.19-Metrics.md | ||
| 4.20-Task-Archiving.md | ||
| 4.21-Worklog.md | ||
| 4.22-Quick-History.md | ||
| 4.23-Managing-Your-Data.md | ||
| 4.24-Integrations.md | ||
| _Footer.md | ||
| _Sidebar.md | ||
| Home.md | ||