Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add diff view #7907

Draft
wants to merge 13 commits into
base: corel
Choose a base branch
from
Draft

feat: add diff view #7907

wants to merge 13 commits into from

Conversation

juice49
Copy link
Contributor

@juice49 juice49 commented Nov 28, 2024

Description

This branch adds a diff view for comparing documents. Primarily, this is for use with versions, but it has been designed to support comparing any two documents.

There are some things that need a fast-follow, but I'd like to get the core of the feature merged into corel now.

Known issues

  • Navigating to references from the diff view is not well supported yet. The reference should be opened in a new browser window, similar to the way Cross Dataset References work.
  • Comments in diff view are not well supported, because the modal does not support document inspectors. I suggest we switch off comments in the diff view for now.
  • When opening the diff view without a previousDocument parameter, the previous document is inferred by finding the next existing document in the release stack.
    • Opening of the modal is deferred until this request is resolved. It would be better to open the modal in a pending state.
    • After the request has been resolved, browser navigation is used to set the previousDocument parameter. This causes a redundant browser history entry to be created, resulting in an unusual experience when navigating back.

What to review

Testing

Notes for release

Copy link

vercel bot commented Nov 28, 2024

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
page-building-studio ✅ Ready (Inspect) Visit Preview 💬 Add feedback Jan 9, 2025 3:47pm
performance-studio ✅ Ready (Inspect) Visit Preview 💬 Add feedback Jan 9, 2025 3:47pm
test-studio ✅ Ready (Inspect) Visit Preview 💬 Add feedback Jan 9, 2025 3:47pm
2 Skipped Deployments
Name Status Preview Comments Updated (UTC)
studio-workshop ⬜️ Ignored (Inspect) Visit Preview Jan 9, 2025 3:47pm
test-next-studio ⬜️ Ignored (Inspect) Visit Preview Jan 9, 2025 3:47pm

Copy link
Contributor

No changes to documentation

@juice49 juice49 force-pushed the feat/corel-267/conflict-resolution branch from f9c9ce5 to cca9390 Compare November 28, 2024 16:23
Copy link
Contributor

github-actions bot commented Nov 28, 2024

Component Testing Report Updated Jan 7, 2025 12:57 PM (UTC)

❌ Failed Tests (134) -- expand for details
File Status Duration Passed Skipped Failed
comments/CommentInput.spec.tsx ❌ Failed (Inspect) 34s 0 0 15
formBuilder/ArrayInput.spec.tsx ❌ Failed (Inspect) 6s 0 0 3
formBuilder/inputs/PortableText/Annotations.spec.tsx ❌ Failed (Inspect) 12s 0 0 6
formBuilder/inputs/PortableText/copyPaste/CopyPaste.spec.tsx ❌ Failed (Inspect) 24s 0 7 11
formBuilder/inputs/PortableText/copyPaste/CopyPasteFields.spec.tsx ✅ Passed (Inspect) 0s 0 12 0
formBuilder/inputs/PortableText/Decorators.spec.tsx ❌ Failed (Inspect) 12s 0 0 6
formBuilder/inputs/PortableText/DisableFocusAndUnset.spec.tsx ❌ Failed (Inspect) 6s 0 0 3
formBuilder/inputs/PortableText/DragAndDrop.spec.tsx ❌ Failed (Inspect) 12s 0 0 6
formBuilder/inputs/PortableText/FocusTracking.spec.tsx ❌ Failed (Inspect) 30s 0 0 15
formBuilder/inputs/PortableText/Input.spec.tsx ❌ Failed (Inspect) 43s 0 0 21
formBuilder/inputs/PortableText/ObjectBlock.spec.tsx ❌ Failed (Inspect) 36s 0 0 18
formBuilder/inputs/PortableText/PresenceCursors.spec.tsx ❌ Failed (Inspect) 6s 0 9 3
formBuilder/inputs/PortableText/Styles.spec.tsx ❌ Failed (Inspect) 12s 0 0 6
formBuilder/inputs/PortableText/Toolbar.spec.tsx ❌ Failed (Inspect) 43s 0 0 21
formBuilder/tree-editing/TreeEditing.spec.tsx ✅ Passed (Inspect) 0s 0 3 0
formBuilder/tree-editing/TreeEditingNestedObjects.spec.tsx ✅ Passed (Inspect) 0s 0 3 0

@juice49 juice49 changed the title Feat/corel 267/conflict resolution feat: conflict resolution Nov 28, 2024
Copy link
Contributor

github-actions bot commented Nov 28, 2024

⚡️ Editor Performance Report

Updated Thu, 28 Nov 2024 16:32:22 GMT

Benchmark reference
latency of sanity@latest
experiment
latency of this branch
Δ (%)
latency difference
article (title) 21.7 efps (46ms) 16.4 efps (61ms) +15ms (+32.6%) 🔴
article (body) 55.9 efps (18ms) 59.9 efps (17ms) -1ms (-6.7%)
article (string inside object) 24.4 efps (41ms) 15.9 efps (63ms) +22ms (+53.7%) 🔴
article (string inside array) 22.2 efps (45ms) 15.2 efps (66ms) +21ms (+46.7%) 🔴
recipe (name) 43.5 efps (23ms) 25.6 efps (39ms) +16ms (+69.6%) 🔴
recipe (description) 55.6 efps (18ms) 27.0 efps (37ms) +19ms (+105.6%) 🔴
recipe (instructions) 99.9+ efps (7ms) 99.9+ efps (7ms) +0ms (-/-%)
synthetic (title) 18.3 efps (55ms) 6.6 efps (152ms) +98ms (+178.9%) 🔴
synthetic (string inside object) 19.6 efps (51ms) 7.1 efps (142ms) +91ms (+177.5%) 🔴

efps — editor "frames per second". The number of updates assumed to be possible within a second.

Derived from input latency. efps = 1000 / input_latency

Detailed information

🏠 Reference result

The performance result of sanity@latest

Benchmark latency p75 p90 p99 blocking time test duration
article (title) 46ms 51ms 59ms 228ms 240ms 12.0s
article (body) 18ms 22ms 30ms 181ms 246ms 6.1s
article (string inside object) 41ms 43ms 47ms 77ms 179ms 7.2s
article (string inside array) 45ms 48ms 64ms 182ms 159ms 7.8s
recipe (name) 23ms 25ms 27ms 42ms 0ms 7.9s
recipe (description) 18ms 20ms 22ms 28ms 0ms 4.6s
recipe (instructions) 7ms 9ms 11ms 15ms 0ms 3.4s
synthetic (title) 55ms 58ms 65ms 259ms 707ms 13.7s
synthetic (string inside object) 51ms 56ms 65ms 119ms 807ms 8.5s

🧪 Experiment result

The performance result of this branch

Benchmark latency p75 p90 p99 blocking time test duration
article (title) 61ms 68ms 84ms 218ms 1460ms 14.0s
article (body) 17ms 20ms 23ms 111ms 223ms 5.6s
article (string inside object) 63ms 66ms 73ms 219ms 1379ms 9.4s
article (string inside array) 66ms 67ms 77ms 348ms 1727ms 9.8s
recipe (name) 39ms 41ms 45ms 70ms 86ms 9.4s
recipe (description) 37ms 39ms 42ms 122ms 32ms 6.7s
recipe (instructions) 7ms 10ms 14ms 29ms 26ms 3.5s
synthetic (title) 152ms 161ms 183ms 606ms 7315ms 22.5s
synthetic (string inside object) 142ms 147ms 153ms 715ms 7219ms 17.8s

📚 Glossary

column definitions

  • benchmark — the name of the test, e.g. "article", followed by the label of the field being measured, e.g. "(title)".
  • latency — the time between when a key was pressed and when it was rendered. derived from a set of samples. the median (p50) is shown to show the most common latency.
  • p75 — the 75th percentile of the input latency in the test run. 75% of the sampled inputs in this benchmark were processed faster than this value. this provides insight into the upper range of typical performance.
  • p90 — the 90th percentile of the input latency in the test run. 90% of the sampled inputs were faster than this. this metric helps identify slower interactions that occurred less frequently during the benchmark.
  • p99 — the 99th percentile of the input latency in the test run. only 1% of sampled inputs were slower than this. this represents the worst-case scenarios encountered during the benchmark, useful for identifying potential performance outliers.
  • blocking time — the total time during which the main thread was blocked, preventing user input and UI updates. this metric helps identify performance bottlenecks that may cause the interface to feel unresponsive.
  • test duration — how long the test run took to complete.

@bjoerge bjoerge force-pushed the corel branch 2 times, most recently from 2a7e87e to 229ecf3 Compare December 4, 2024 08:35
@juice49 juice49 force-pushed the feat/corel-267/conflict-resolution branch from 43a180d to 3adf9ed Compare December 4, 2024 15:01
@juice49 juice49 force-pushed the feat/corel-267/conflict-resolution branch from 3adf9ed to 6ea4097 Compare December 9, 2024 13:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant